diff --git a/gen/abusiveexperiencereport1/src/api.rs b/gen/abusiveexperiencereport1/src/api.rs index dcd10d5e5a..7a12456eb8 100644 --- a/gen/abusiveexperiencereport1/src/api.rs +++ b/gen/abusiveexperiencereport1/src/api.rs @@ -454,25 +454,15 @@ impl<'a, C> SiteGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -480,13 +470,15 @@ impl<'a, C> SiteGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -663,25 +655,15 @@ impl<'a, C> ViolatingSiteListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -689,13 +671,15 @@ impl<'a, C> ViolatingSiteListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/abusiveexperiencereport1/src/client.rs b/gen/abusiveexperiencereport1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/abusiveexperiencereport1/src/client.rs +++ b/gen/abusiveexperiencereport1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/acceleratedmobilepageurl1/src/api.rs b/gen/acceleratedmobilepageurl1/src/api.rs index d7298a81ee..dc51afceac 100644 --- a/gen/acceleratedmobilepageurl1/src/api.rs +++ b/gen/acceleratedmobilepageurl1/src/api.rs @@ -429,25 +429,15 @@ impl<'a, C> AmpUrlBatchGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -455,13 +445,15 @@ impl<'a, C> AmpUrlBatchGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/acceleratedmobilepageurl1/src/client.rs b/gen/acceleratedmobilepageurl1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/acceleratedmobilepageurl1/src/client.rs +++ b/gen/acceleratedmobilepageurl1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/accessapproval1-cli/src/main.rs b/gen/accessapproval1-cli/src/main.rs index 3359971d1a..225e94b56b 100644 --- a/gen/accessapproval1-cli/src/main.rs +++ b/gen/accessapproval1-cli/src/main.rs @@ -291,7 +291,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -769,7 +769,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1247,7 +1247,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/accessapproval1/src/api.rs b/gen/accessapproval1/src/api.rs index 3874864f31..3b2aa220c8 100644 --- a/gen/accessapproval1/src/api.rs +++ b/gen/accessapproval1/src/api.rs @@ -1118,25 +1118,15 @@ impl<'a, C> FolderApprovalRequestApproveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1144,13 +1134,15 @@ impl<'a, C> FolderApprovalRequestApproveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1415,25 +1407,15 @@ impl<'a, C> FolderApprovalRequestDismisCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1441,13 +1423,15 @@ impl<'a, C> FolderApprovalRequestDismisCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1691,25 +1675,15 @@ impl<'a, C> FolderApprovalRequestGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1717,13 +1691,15 @@ impl<'a, C> FolderApprovalRequestGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1973,25 +1949,15 @@ impl<'a, C> FolderApprovalRequestListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1999,13 +1965,15 @@ impl<'a, C> FolderApprovalRequestListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2261,25 +2229,15 @@ impl<'a, C> FolderDeleteAccessApprovalSettingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2287,13 +2245,15 @@ impl<'a, C> FolderDeleteAccessApprovalSettingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2528,25 +2488,15 @@ impl<'a, C> FolderGetAccessApprovalSettingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2554,13 +2504,15 @@ impl<'a, C> FolderGetAccessApprovalSettingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2821,25 +2773,15 @@ impl<'a, C> FolderUpdateAccessApprovalSettingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2847,13 +2789,15 @@ impl<'a, C> FolderUpdateAccessApprovalSettingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3125,25 +3069,15 @@ impl<'a, C> OrganizationApprovalRequestApproveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3151,13 +3085,15 @@ impl<'a, C> OrganizationApprovalRequestApproveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3422,25 +3358,15 @@ impl<'a, C> OrganizationApprovalRequestDismisCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3448,13 +3374,15 @@ impl<'a, C> OrganizationApprovalRequestDismisCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3698,25 +3626,15 @@ impl<'a, C> OrganizationApprovalRequestGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3724,13 +3642,15 @@ impl<'a, C> OrganizationApprovalRequestGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3980,25 +3900,15 @@ impl<'a, C> OrganizationApprovalRequestListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4006,13 +3916,15 @@ impl<'a, C> OrganizationApprovalRequestListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4268,25 +4180,15 @@ impl<'a, C> OrganizationDeleteAccessApprovalSettingCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4294,13 +4196,15 @@ impl<'a, C> OrganizationDeleteAccessApprovalSettingCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4535,25 +4439,15 @@ impl<'a, C> OrganizationGetAccessApprovalSettingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4561,13 +4455,15 @@ impl<'a, C> OrganizationGetAccessApprovalSettingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4828,25 +4724,15 @@ impl<'a, C> OrganizationUpdateAccessApprovalSettingCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4854,13 +4740,15 @@ impl<'a, C> OrganizationUpdateAccessApprovalSettingCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5132,25 +5020,15 @@ impl<'a, C> ProjectApprovalRequestApproveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5158,13 +5036,15 @@ impl<'a, C> ProjectApprovalRequestApproveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5429,25 +5309,15 @@ impl<'a, C> ProjectApprovalRequestDismisCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5455,13 +5325,15 @@ impl<'a, C> ProjectApprovalRequestDismisCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5705,25 +5577,15 @@ impl<'a, C> ProjectApprovalRequestGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5731,13 +5593,15 @@ impl<'a, C> ProjectApprovalRequestGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5987,25 +5851,15 @@ impl<'a, C> ProjectApprovalRequestListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6013,13 +5867,15 @@ impl<'a, C> ProjectApprovalRequestListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6275,25 +6131,15 @@ impl<'a, C> ProjectDeleteAccessApprovalSettingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6301,13 +6147,15 @@ impl<'a, C> ProjectDeleteAccessApprovalSettingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6542,25 +6390,15 @@ impl<'a, C> ProjectGetAccessApprovalSettingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6568,13 +6406,15 @@ impl<'a, C> ProjectGetAccessApprovalSettingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6835,25 +6675,15 @@ impl<'a, C> ProjectUpdateAccessApprovalSettingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6861,13 +6691,15 @@ impl<'a, C> ProjectUpdateAccessApprovalSettingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/accessapproval1/src/client.rs b/gen/accessapproval1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/accessapproval1/src/client.rs +++ b/gen/accessapproval1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/accessapproval1_beta1/src/api.rs b/gen/accessapproval1_beta1/src/api.rs index 52fc65c406..8650637ee5 100644 --- a/gen/accessapproval1_beta1/src/api.rs +++ b/gen/accessapproval1_beta1/src/api.rs @@ -1278,25 +1278,15 @@ impl<'a, C> FolderApprovalRequestApproveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1304,13 +1294,15 @@ impl<'a, C> FolderApprovalRequestApproveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1584,25 +1576,15 @@ impl<'a, C> FolderApprovalRequestDismisCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1610,13 +1592,15 @@ impl<'a, C> FolderApprovalRequestDismisCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1860,25 +1844,15 @@ impl<'a, C> FolderApprovalRequestGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1886,13 +1860,15 @@ impl<'a, C> FolderApprovalRequestGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2144,25 +2120,15 @@ impl<'a, C> FolderApprovalRequestListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2170,13 +2136,15 @@ impl<'a, C> FolderApprovalRequestListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2447,25 +2415,15 @@ impl<'a, C> FolderDeleteAccessApprovalSettingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2473,13 +2431,15 @@ impl<'a, C> FolderDeleteAccessApprovalSettingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2714,25 +2674,15 @@ impl<'a, C> FolderGetAccessApprovalSettingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2740,13 +2690,15 @@ impl<'a, C> FolderGetAccessApprovalSettingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3008,25 +2960,15 @@ impl<'a, C> FolderUpdateAccessApprovalSettingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3034,13 +2976,15 @@ impl<'a, C> FolderUpdateAccessApprovalSettingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3323,25 +3267,15 @@ impl<'a, C> OrganizationApprovalRequestApproveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3349,13 +3283,15 @@ impl<'a, C> OrganizationApprovalRequestApproveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3629,25 +3565,15 @@ impl<'a, C> OrganizationApprovalRequestDismisCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3655,13 +3581,15 @@ impl<'a, C> OrganizationApprovalRequestDismisCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3905,25 +3833,15 @@ impl<'a, C> OrganizationApprovalRequestGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3931,13 +3849,15 @@ impl<'a, C> OrganizationApprovalRequestGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4189,25 +4109,15 @@ impl<'a, C> OrganizationApprovalRequestListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4215,13 +4125,15 @@ impl<'a, C> OrganizationApprovalRequestListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4492,25 +4404,15 @@ impl<'a, C> OrganizationDeleteAccessApprovalSettingCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4518,13 +4420,15 @@ impl<'a, C> OrganizationDeleteAccessApprovalSettingCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4759,25 +4663,15 @@ impl<'a, C> OrganizationGetAccessApprovalSettingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4785,13 +4679,15 @@ impl<'a, C> OrganizationGetAccessApprovalSettingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5053,25 +4949,15 @@ impl<'a, C> OrganizationUpdateAccessApprovalSettingCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5079,13 +4965,15 @@ impl<'a, C> OrganizationUpdateAccessApprovalSettingCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5368,25 +5256,15 @@ impl<'a, C> ProjectApprovalRequestApproveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5394,13 +5272,15 @@ impl<'a, C> ProjectApprovalRequestApproveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5674,25 +5554,15 @@ impl<'a, C> ProjectApprovalRequestDismisCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5700,13 +5570,15 @@ impl<'a, C> ProjectApprovalRequestDismisCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5950,25 +5822,15 @@ impl<'a, C> ProjectApprovalRequestGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5976,13 +5838,15 @@ impl<'a, C> ProjectApprovalRequestGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6234,25 +6098,15 @@ impl<'a, C> ProjectApprovalRequestListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6260,13 +6114,15 @@ impl<'a, C> ProjectApprovalRequestListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6537,25 +6393,15 @@ impl<'a, C> ProjectDeleteAccessApprovalSettingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6563,13 +6409,15 @@ impl<'a, C> ProjectDeleteAccessApprovalSettingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6804,25 +6652,15 @@ impl<'a, C> ProjectGetAccessApprovalSettingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6830,13 +6668,15 @@ impl<'a, C> ProjectGetAccessApprovalSettingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7098,25 +6938,15 @@ impl<'a, C> ProjectUpdateAccessApprovalSettingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7124,13 +6954,15 @@ impl<'a, C> ProjectUpdateAccessApprovalSettingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/accessapproval1_beta1/src/client.rs b/gen/accessapproval1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/accessapproval1_beta1/src/client.rs +++ b/gen/accessapproval1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/accesscontextmanager1-cli/src/main.rs b/gen/accesscontextmanager1-cli/src/main.rs index 46e3c424db..c88e37c049 100644 --- a/gen/accesscontextmanager1-cli/src/main.rs +++ b/gen/accesscontextmanager1-cli/src/main.rs @@ -705,7 +705,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "parent", "page-token"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "parent"].iter().map(|v|*v)); v } )); } } @@ -1582,7 +1582,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/accesscontextmanager1/src/api.rs b/gen/accesscontextmanager1/src/api.rs index 99db82b635..5d7495a28a 100644 --- a/gen/accesscontextmanager1/src/api.rs +++ b/gen/accesscontextmanager1/src/api.rs @@ -1659,25 +1659,15 @@ impl<'a, C> AccessPolicyAccessLevelCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1685,13 +1675,15 @@ impl<'a, C> AccessPolicyAccessLevelCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1935,25 +1927,15 @@ impl<'a, C> AccessPolicyAccessLevelDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1961,13 +1943,15 @@ impl<'a, C> AccessPolicyAccessLevelDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2207,25 +2191,15 @@ impl<'a, C> AccessPolicyAccessLevelGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2233,13 +2207,15 @@ impl<'a, C> AccessPolicyAccessLevelGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2496,25 +2472,15 @@ impl<'a, C> AccessPolicyAccessLevelListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2522,13 +2488,15 @@ impl<'a, C> AccessPolicyAccessLevelListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2810,25 +2778,15 @@ impl<'a, C> AccessPolicyAccessLevelPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2836,13 +2794,15 @@ impl<'a, C> AccessPolicyAccessLevelPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3114,25 +3074,15 @@ impl<'a, C> AccessPolicyAccessLevelReplaceAllCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3140,13 +3090,15 @@ impl<'a, C> AccessPolicyAccessLevelReplaceAllCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3411,25 +3363,15 @@ impl<'a, C> AccessPolicyServicePerimeterCommitCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3437,13 +3379,15 @@ impl<'a, C> AccessPolicyServicePerimeterCommitCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3708,25 +3652,15 @@ impl<'a, C> AccessPolicyServicePerimeterCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3734,13 +3668,15 @@ impl<'a, C> AccessPolicyServicePerimeterCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3984,25 +3920,15 @@ impl<'a, C> AccessPolicyServicePerimeterDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4010,13 +3936,15 @@ impl<'a, C> AccessPolicyServicePerimeterDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4251,25 +4179,15 @@ impl<'a, C> AccessPolicyServicePerimeterGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4277,13 +4195,15 @@ impl<'a, C> AccessPolicyServicePerimeterGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4528,25 +4448,15 @@ impl<'a, C> AccessPolicyServicePerimeterListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4554,13 +4464,15 @@ impl<'a, C> AccessPolicyServicePerimeterListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4835,25 +4747,15 @@ impl<'a, C> AccessPolicyServicePerimeterPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4861,13 +4763,15 @@ impl<'a, C> AccessPolicyServicePerimeterPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5139,25 +5043,15 @@ impl<'a, C> AccessPolicyServicePerimeterReplaceAllCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5165,13 +5059,15 @@ impl<'a, C> AccessPolicyServicePerimeterReplaceAllCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5409,25 +5305,15 @@ impl<'a, C> AccessPolicyCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5435,13 +5321,15 @@ impl<'a, C> AccessPolicyCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5675,25 +5563,15 @@ impl<'a, C> AccessPolicyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5701,13 +5579,15 @@ impl<'a, C> AccessPolicyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5942,25 +5822,15 @@ impl<'a, C> AccessPolicyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5968,13 +5838,15 @@ impl<'a, C> AccessPolicyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6197,25 +6069,15 @@ impl<'a, C> AccessPolicyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6223,13 +6085,15 @@ impl<'a, C> AccessPolicyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6501,25 +6365,15 @@ impl<'a, C> AccessPolicyPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6527,13 +6381,15 @@ impl<'a, C> AccessPolicyPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6805,25 +6661,15 @@ impl<'a, C> OperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6831,13 +6677,15 @@ impl<'a, C> OperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7081,25 +6929,15 @@ impl<'a, C> OperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7107,13 +6945,15 @@ impl<'a, C> OperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7348,25 +7188,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7374,13 +7204,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7630,25 +7462,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7656,13 +7478,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7939,25 +7763,15 @@ impl<'a, C> OrganizationGcpUserAccessBindingCreateCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7965,13 +7779,15 @@ impl<'a, C> OrganizationGcpUserAccessBindingCreateCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8215,25 +8031,15 @@ impl<'a, C> OrganizationGcpUserAccessBindingDeleteCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8241,13 +8047,15 @@ impl<'a, C> OrganizationGcpUserAccessBindingDeleteCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8482,25 +8290,15 @@ impl<'a, C> OrganizationGcpUserAccessBindingGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8508,13 +8306,15 @@ impl<'a, C> OrganizationGcpUserAccessBindingGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8759,25 +8559,15 @@ impl<'a, C> OrganizationGcpUserAccessBindingListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8785,13 +8575,15 @@ impl<'a, C> OrganizationGcpUserAccessBindingListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9066,25 +8858,15 @@ impl<'a, C> OrganizationGcpUserAccessBindingPatchCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9092,13 +8874,15 @@ impl<'a, C> OrganizationGcpUserAccessBindingPatchCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/accesscontextmanager1/src/client.rs b/gen/accesscontextmanager1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/accesscontextmanager1/src/client.rs +++ b/gen/accesscontextmanager1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/accesscontextmanager1_beta-cli/src/main.rs b/gen/accesscontextmanager1_beta-cli/src/main.rs index cf6dc3b6a8..13dd0d482b 100644 --- a/gen/accesscontextmanager1_beta-cli/src/main.rs +++ b/gen/accesscontextmanager1_beta-cli/src/main.rs @@ -270,7 +270,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "access-level-format"].iter().map(|v|*v)); + v.extend(["access-level-format", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -619,7 +619,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "parent", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "parent"].iter().map(|v|*v)); v } )); } } @@ -967,7 +967,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/accesscontextmanager1_beta/src/api.rs b/gen/accesscontextmanager1_beta/src/api.rs index ac5c8a217a..496d8efe13 100644 --- a/gen/accesscontextmanager1_beta/src/api.rs +++ b/gen/accesscontextmanager1_beta/src/api.rs @@ -1086,25 +1086,15 @@ impl<'a, C> AccessPolicyAccessLevelCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1112,13 +1102,15 @@ impl<'a, C> AccessPolicyAccessLevelCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1362,25 +1354,15 @@ impl<'a, C> AccessPolicyAccessLevelDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1388,13 +1370,15 @@ impl<'a, C> AccessPolicyAccessLevelDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1634,25 +1618,15 @@ impl<'a, C> AccessPolicyAccessLevelGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1660,13 +1634,15 @@ impl<'a, C> AccessPolicyAccessLevelGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1923,25 +1899,15 @@ impl<'a, C> AccessPolicyAccessLevelListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1949,13 +1915,15 @@ impl<'a, C> AccessPolicyAccessLevelListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2237,25 +2205,15 @@ impl<'a, C> AccessPolicyAccessLevelPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2263,13 +2221,15 @@ impl<'a, C> AccessPolicyAccessLevelPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2541,25 +2501,15 @@ impl<'a, C> AccessPolicyServicePerimeterCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2567,13 +2517,15 @@ impl<'a, C> AccessPolicyServicePerimeterCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2817,25 +2769,15 @@ impl<'a, C> AccessPolicyServicePerimeterDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2843,13 +2785,15 @@ impl<'a, C> AccessPolicyServicePerimeterDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3084,25 +3028,15 @@ impl<'a, C> AccessPolicyServicePerimeterGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3110,13 +3044,15 @@ impl<'a, C> AccessPolicyServicePerimeterGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3361,25 +3297,15 @@ impl<'a, C> AccessPolicyServicePerimeterListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3387,13 +3313,15 @@ impl<'a, C> AccessPolicyServicePerimeterListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3668,25 +3596,15 @@ impl<'a, C> AccessPolicyServicePerimeterPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3694,13 +3612,15 @@ impl<'a, C> AccessPolicyServicePerimeterPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3945,25 +3865,15 @@ impl<'a, C> AccessPolicyCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3971,13 +3881,15 @@ impl<'a, C> AccessPolicyCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4211,25 +4123,15 @@ impl<'a, C> AccessPolicyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4237,13 +4139,15 @@ impl<'a, C> AccessPolicyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4478,25 +4382,15 @@ impl<'a, C> AccessPolicyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4504,13 +4398,15 @@ impl<'a, C> AccessPolicyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4733,25 +4629,15 @@ impl<'a, C> AccessPolicyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4759,13 +4645,15 @@ impl<'a, C> AccessPolicyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5037,25 +4925,15 @@ impl<'a, C> AccessPolicyPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5063,13 +4941,15 @@ impl<'a, C> AccessPolicyPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5320,25 +5200,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5346,13 +5216,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/accesscontextmanager1_beta/src/client.rs b/gen/accesscontextmanager1_beta/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/accesscontextmanager1_beta/src/client.rs +++ b/gen/accesscontextmanager1_beta/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/adexchangebuyer1d3-cli/src/main.rs b/gen/adexchangebuyer1d3-cli/src/main.rs index 6b17269ea4..7d547614a3 100644 --- a/gen/adexchangebuyer1d3-cli/src/main.rs +++ b/gen/adexchangebuyer1d3-cli/src/main.rs @@ -879,7 +879,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "account-id", "max-results", "status-filter", "buyer-creative-id"].iter().map(|v|*v)); + v.extend(["account-id", "buyer-creative-id", "max-results", "page-token", "status-filter"].iter().map(|v|*v)); v } )); } } diff --git a/gen/adexchangebuyer1d3/src/api.rs b/gen/adexchangebuyer1d3/src/api.rs index ab2cc7c7bd..79e4851cba 100644 --- a/gen/adexchangebuyer1d3/src/api.rs +++ b/gen/adexchangebuyer1d3/src/api.rs @@ -1798,25 +1798,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1824,13 +1814,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2034,25 +2026,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2060,13 +2042,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2304,25 +2288,15 @@ impl<'a, C> AccountPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2330,13 +2304,15 @@ impl<'a, C> AccountPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2593,25 +2569,15 @@ impl<'a, C> AccountUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2619,13 +2585,15 @@ impl<'a, C> AccountUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2861,25 +2829,15 @@ impl<'a, C> BillingInfoGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2887,13 +2845,15 @@ impl<'a, C> BillingInfoGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3097,25 +3057,15 @@ impl<'a, C> BillingInfoListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3123,13 +3073,15 @@ impl<'a, C> BillingInfoListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3348,25 +3300,15 @@ impl<'a, C> BudgetGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3374,13 +3316,15 @@ impl<'a, C> BudgetGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3640,25 +3584,15 @@ impl<'a, C> BudgetPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3666,13 +3600,15 @@ impl<'a, C> BudgetPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3941,25 +3877,15 @@ impl<'a, C> BudgetUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3967,13 +3893,15 @@ impl<'a, C> BudgetUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4221,25 +4149,15 @@ impl<'a, C> CreativeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4247,13 +4165,15 @@ impl<'a, C> CreativeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4488,25 +4408,15 @@ impl<'a, C> CreativeInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4514,13 +4424,15 @@ impl<'a, C> CreativeInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4752,25 +4664,15 @@ impl<'a, C> CreativeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4778,13 +4680,15 @@ impl<'a, C> CreativeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5038,25 +4942,15 @@ impl<'a, C> DirectDealGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5064,13 +4958,15 @@ impl<'a, C> DirectDealGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5274,25 +5170,15 @@ impl<'a, C> DirectDealListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5300,13 +5186,15 @@ impl<'a, C> DirectDealListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5516,25 +5404,15 @@ impl<'a, C> PerformanceReportListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5542,13 +5420,15 @@ impl<'a, C> PerformanceReportListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5810,25 +5690,15 @@ impl<'a, C> PretargetingConfigDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5836,11 +5706,11 @@ impl<'a, C> PretargetingConfigDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -6073,25 +5943,15 @@ impl<'a, C> PretargetingConfigGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6099,13 +5959,15 @@ impl<'a, C> PretargetingConfigGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6363,25 +6225,15 @@ impl<'a, C> PretargetingConfigInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6389,13 +6241,15 @@ impl<'a, C> PretargetingConfigInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6631,25 +6485,15 @@ impl<'a, C> PretargetingConfigListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6657,13 +6501,15 @@ impl<'a, C> PretargetingConfigListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6913,25 +6759,15 @@ impl<'a, C> PretargetingConfigPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6939,13 +6775,15 @@ impl<'a, C> PretargetingConfigPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7214,25 +7052,15 @@ impl<'a, C> PretargetingConfigUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7240,13 +7068,15 @@ impl<'a, C> PretargetingConfigUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/adexchangebuyer1d3/src/client.rs b/gen/adexchangebuyer1d3/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/adexchangebuyer1d3/src/client.rs +++ b/gen/adexchangebuyer1d3/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/adexchangebuyer1d4-cli/src/main.rs b/gen/adexchangebuyer1d4-cli/src/main.rs index b13a4c2975..5e785bd12c 100644 --- a/gen/adexchangebuyer1d4-cli/src/main.rs +++ b/gen/adexchangebuyer1d4-cli/src/main.rs @@ -945,7 +945,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "account-id", "buyer-creative-id", "page-token", "deals-status-filter", "open-auction-status-filter"].iter().map(|v|*v)); + v.extend(["account-id", "buyer-creative-id", "deals-status-filter", "max-results", "open-auction-status-filter", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/adexchangebuyer1d4/src/api.rs b/gen/adexchangebuyer1d4/src/api.rs index 37a6386862..c62c78c27b 100644 --- a/gen/adexchangebuyer1d4/src/api.rs +++ b/gen/adexchangebuyer1d4/src/api.rs @@ -3769,25 +3769,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3795,13 +3785,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4005,25 +3997,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4031,13 +4013,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4280,25 +4264,15 @@ impl<'a, C> AccountPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4306,13 +4280,15 @@ impl<'a, C> AccountPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4581,25 +4557,15 @@ impl<'a, C> AccountUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4607,13 +4573,15 @@ impl<'a, C> AccountUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4856,25 +4824,15 @@ impl<'a, C> BillingInfoGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4882,13 +4840,15 @@ impl<'a, C> BillingInfoGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5092,25 +5052,15 @@ impl<'a, C> BillingInfoListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5118,13 +5068,15 @@ impl<'a, C> BillingInfoListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5343,25 +5295,15 @@ impl<'a, C> BudgetGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5369,13 +5311,15 @@ impl<'a, C> BudgetGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5635,25 +5579,15 @@ impl<'a, C> BudgetPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5661,13 +5595,15 @@ impl<'a, C> BudgetPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5936,25 +5872,15 @@ impl<'a, C> BudgetUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5962,13 +5888,15 @@ impl<'a, C> BudgetUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6217,25 +6145,15 @@ impl<'a, C> CreativeAddDealCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6243,11 +6161,11 @@ impl<'a, C> CreativeAddDealCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -6490,25 +6408,15 @@ impl<'a, C> CreativeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6516,13 +6424,15 @@ impl<'a, C> CreativeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6757,25 +6667,15 @@ impl<'a, C> CreativeInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6783,13 +6683,15 @@ impl<'a, C> CreativeInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7026,25 +6928,15 @@ impl<'a, C> CreativeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7052,13 +6944,15 @@ impl<'a, C> CreativeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7321,25 +7215,15 @@ impl<'a, C> CreativeListDealCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7347,13 +7231,15 @@ impl<'a, C> CreativeListDealCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7593,25 +7479,15 @@ impl<'a, C> CreativeRemoveDealCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7619,11 +7495,11 @@ impl<'a, C> CreativeRemoveDealCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -7885,25 +7761,15 @@ impl<'a, C> MarketplacedealDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7911,13 +7777,15 @@ impl<'a, C> MarketplacedealDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8174,25 +8042,15 @@ impl<'a, C> MarketplacedealInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8200,13 +8058,15 @@ impl<'a, C> MarketplacedealInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8447,25 +8307,15 @@ impl<'a, C> MarketplacedealListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8473,13 +8323,15 @@ impl<'a, C> MarketplacedealListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8734,25 +8586,15 @@ impl<'a, C> MarketplacedealUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8760,13 +8602,15 @@ impl<'a, C> MarketplacedealUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9023,25 +8867,15 @@ impl<'a, C> MarketplacenoteInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9049,13 +8883,15 @@ impl<'a, C> MarketplacenoteInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9296,25 +9132,15 @@ impl<'a, C> MarketplacenoteListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9322,13 +9148,15 @@ impl<'a, C> MarketplacenoteListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9582,25 +9410,15 @@ impl<'a, C> MarketplaceprivateauctionUpdateproposalCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9608,11 +9426,11 @@ impl<'a, C> MarketplaceprivateauctionUpdateproposalCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -9835,25 +9653,15 @@ impl<'a, C> PerformanceReportListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9861,13 +9669,15 @@ impl<'a, C> PerformanceReportListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10129,25 +9939,15 @@ impl<'a, C> PretargetingConfigDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10155,11 +9955,11 @@ impl<'a, C> PretargetingConfigDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -10392,25 +10192,15 @@ impl<'a, C> PretargetingConfigGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10418,13 +10208,15 @@ impl<'a, C> PretargetingConfigGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10682,25 +10474,15 @@ impl<'a, C> PretargetingConfigInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10708,13 +10490,15 @@ impl<'a, C> PretargetingConfigInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10950,25 +10734,15 @@ impl<'a, C> PretargetingConfigListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10976,13 +10750,15 @@ impl<'a, C> PretargetingConfigListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11232,25 +11008,15 @@ impl<'a, C> PretargetingConfigPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11258,13 +11024,15 @@ impl<'a, C> PretargetingConfigPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11533,25 +11301,15 @@ impl<'a, C> PretargetingConfigUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11559,13 +11317,15 @@ impl<'a, C> PretargetingConfigUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11811,25 +11571,15 @@ impl<'a, C> ProductGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11837,13 +11587,15 @@ impl<'a, C> ProductGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12052,25 +11804,15 @@ impl<'a, C> ProductSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12078,13 +11820,15 @@ impl<'a, C> ProductSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12308,25 +12052,15 @@ impl<'a, C> ProposalGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12334,13 +12068,15 @@ impl<'a, C> ProposalGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12565,25 +12301,15 @@ impl<'a, C> ProposalInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12591,13 +12317,15 @@ impl<'a, C> ProposalInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12848,25 +12576,15 @@ impl<'a, C> ProposalPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12874,13 +12592,15 @@ impl<'a, C> ProposalPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13118,25 +12838,15 @@ impl<'a, C> ProposalSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13144,13 +12854,15 @@ impl<'a, C> ProposalSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13373,25 +13085,15 @@ impl<'a, C> ProposalSetupcompleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13399,11 +13101,11 @@ impl<'a, C> ProposalSetupcompleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -13649,25 +13351,15 @@ impl<'a, C> ProposalUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13675,13 +13367,15 @@ impl<'a, C> ProposalUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13937,25 +13631,15 @@ impl<'a, C> PubprofileListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13963,13 +13647,15 @@ impl<'a, C> PubprofileListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/adexchangebuyer1d4/src/client.rs b/gen/adexchangebuyer1d4/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/adexchangebuyer1d4/src/client.rs +++ b/gen/adexchangebuyer1d4/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/adexchangebuyer2_v2_beta1-cli/src/main.rs b/gen/adexchangebuyer2_v2_beta1-cli/src/main.rs index 05845de855..9782fb0192 100644 --- a/gen/adexchangebuyer2_v2_beta1-cli/src/main.rs +++ b/gen/adexchangebuyer2_v2_beta1-cli/src/main.rs @@ -1553,7 +1553,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter-syntax", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "filter-syntax", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1667,7 +1667,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2226,7 +2226,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter-syntax", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "filter-syntax", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/adexchangebuyer2_v2_beta1/src/api.rs b/gen/adexchangebuyer2_v2_beta1/src/api.rs index 61215e3268..f273280993 100644 --- a/gen/adexchangebuyer2_v2_beta1/src/api.rs +++ b/gen/adexchangebuyer2_v2_beta1/src/api.rs @@ -4082,25 +4082,15 @@ impl<'a, C> AccountClientInvitationCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4108,13 +4098,15 @@ impl<'a, C> AccountClientInvitationCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4368,25 +4360,15 @@ impl<'a, C> AccountClientInvitationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4394,13 +4376,15 @@ impl<'a, C> AccountClientInvitationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4663,25 +4647,15 @@ impl<'a, C> AccountClientInvitationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4689,13 +4663,15 @@ impl<'a, C> AccountClientInvitationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4954,25 +4930,15 @@ impl<'a, C> AccountClientUserGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4980,13 +4946,15 @@ impl<'a, C> AccountClientUserGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5249,25 +5217,15 @@ impl<'a, C> AccountClientUserListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5275,13 +5233,15 @@ impl<'a, C> AccountClientUserListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5561,25 +5521,15 @@ impl<'a, C> AccountClientUserUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5587,13 +5537,15 @@ impl<'a, C> AccountClientUserUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5874,25 +5826,15 @@ impl<'a, C> AccountClientCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5900,13 +5842,15 @@ impl<'a, C> AccountClientCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6148,25 +6092,15 @@ impl<'a, C> AccountClientGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6174,13 +6108,15 @@ impl<'a, C> AccountClientGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6436,25 +6372,15 @@ impl<'a, C> AccountClientListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6462,13 +6388,15 @@ impl<'a, C> AccountClientListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6743,25 +6671,15 @@ impl<'a, C> AccountClientUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6769,13 +6687,15 @@ impl<'a, C> AccountClientUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7048,25 +6968,15 @@ impl<'a, C> AccountCreativeDealAssociationAddCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7074,13 +6984,15 @@ impl<'a, C> AccountCreativeDealAssociationAddCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7347,25 +7259,15 @@ impl<'a, C> AccountCreativeDealAssociationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7373,13 +7275,15 @@ impl<'a, C> AccountCreativeDealAssociationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7664,25 +7568,15 @@ impl<'a, C> AccountCreativeDealAssociationRemoveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7690,13 +7584,15 @@ impl<'a, C> AccountCreativeDealAssociationRemoveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7972,25 +7868,15 @@ impl<'a, C> AccountCreativeCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7998,13 +7884,15 @@ impl<'a, C> AccountCreativeCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8253,25 +8141,15 @@ impl<'a, C> AccountCreativeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8279,13 +8157,15 @@ impl<'a, C> AccountCreativeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8541,25 +8421,15 @@ impl<'a, C> AccountCreativeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8567,13 +8437,15 @@ impl<'a, C> AccountCreativeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8848,25 +8720,15 @@ impl<'a, C> AccountCreativeStopWatchingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8874,13 +8736,15 @@ impl<'a, C> AccountCreativeStopWatchingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9153,25 +9017,15 @@ impl<'a, C> AccountCreativeUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9179,13 +9033,15 @@ impl<'a, C> AccountCreativeUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9458,25 +9314,15 @@ impl<'a, C> AccountCreativeWatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9484,13 +9330,15 @@ impl<'a, C> AccountCreativeWatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9760,25 +9608,15 @@ impl<'a, C> AccountFinalizedProposalListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9786,13 +9624,15 @@ impl<'a, C> AccountFinalizedProposalListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10053,25 +9893,15 @@ impl<'a, C> AccountProductGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10079,13 +9909,15 @@ impl<'a, C> AccountProductGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10341,25 +10173,15 @@ impl<'a, C> AccountProductListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10367,13 +10189,15 @@ impl<'a, C> AccountProductListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10648,25 +10472,15 @@ impl<'a, C> AccountProposalAcceptCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10674,13 +10488,15 @@ impl<'a, C> AccountProposalAcceptCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10953,25 +10769,15 @@ impl<'a, C> AccountProposalAddNoteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10979,13 +10785,15 @@ impl<'a, C> AccountProposalAddNoteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11258,25 +11066,15 @@ impl<'a, C> AccountProposalCancelNegotiationCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11284,13 +11082,15 @@ impl<'a, C> AccountProposalCancelNegotiationCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11563,25 +11363,15 @@ impl<'a, C> AccountProposalCompleteSetupCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11589,13 +11379,15 @@ impl<'a, C> AccountProposalCompleteSetupCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11866,25 +11658,15 @@ impl<'a, C> AccountProposalCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11892,13 +11674,15 @@ impl<'a, C> AccountProposalCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12140,25 +11924,15 @@ impl<'a, C> AccountProposalGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12166,13 +11940,15 @@ impl<'a, C> AccountProposalGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12433,25 +12209,15 @@ impl<'a, C> AccountProposalListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12459,13 +12225,15 @@ impl<'a, C> AccountProposalListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12747,25 +12515,15 @@ impl<'a, C> AccountProposalPauseCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12773,13 +12531,15 @@ impl<'a, C> AccountProposalPauseCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13052,25 +12812,15 @@ impl<'a, C> AccountProposalResumeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13078,13 +12828,15 @@ impl<'a, C> AccountProposalResumeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13357,25 +13109,15 @@ impl<'a, C> AccountProposalUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13383,13 +13125,15 @@ impl<'a, C> AccountProposalUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13641,25 +13385,15 @@ impl<'a, C> AccountPublisherProfileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13667,13 +13401,15 @@ impl<'a, C> AccountPublisherProfileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13924,25 +13660,15 @@ impl<'a, C> AccountPublisherProfileListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13950,13 +13676,15 @@ impl<'a, C> AccountPublisherProfileListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14215,25 +13943,15 @@ impl<'a, C> BidderAccountFilterSetBidMetricListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14241,13 +13959,15 @@ impl<'a, C> BidderAccountFilterSetBidMetricListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14506,25 +14226,15 @@ impl<'a, C> BidderAccountFilterSetBidResponseErrorListCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14532,13 +14242,15 @@ impl<'a, C> BidderAccountFilterSetBidResponseErrorListCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14797,25 +14509,15 @@ impl<'a, C> BidderAccountFilterSetBidResponsesWithoutBidListCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14823,13 +14525,15 @@ impl<'a, C> BidderAccountFilterSetBidResponsesWithoutBidListCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15088,25 +14792,15 @@ impl<'a, C> BidderAccountFilterSetFilteredBidRequestListCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15114,13 +14808,15 @@ impl<'a, C> BidderAccountFilterSetFilteredBidRequestListCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15381,25 +15077,15 @@ impl<'a, C> BidderAccountFilterSetFilteredBidCreativeListCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15407,13 +15093,15 @@ impl<'a, C> BidderAccountFilterSetFilteredBidCreativeListCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15684,25 +15372,15 @@ impl<'a, C> BidderAccountFilterSetFilteredBidDetailListCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15710,13 +15388,15 @@ impl<'a, C> BidderAccountFilterSetFilteredBidDetailListCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15985,25 +15665,15 @@ impl<'a, C> BidderAccountFilterSetFilteredBidListCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16011,13 +15681,15 @@ impl<'a, C> BidderAccountFilterSetFilteredBidListCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16276,25 +15948,15 @@ impl<'a, C> BidderAccountFilterSetImpressionMetricListCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16302,13 +15964,15 @@ impl<'a, C> BidderAccountFilterSetImpressionMetricListCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16567,25 +16231,15 @@ impl<'a, C> BidderAccountFilterSetLosingBidListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16593,13 +16247,15 @@ impl<'a, C> BidderAccountFilterSetLosingBidListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16858,25 +16514,15 @@ impl<'a, C> BidderAccountFilterSetNonBillableWinningBidListCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16884,13 +16530,15 @@ impl<'a, C> BidderAccountFilterSetNonBillableWinningBidListCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17165,25 +16813,15 @@ impl<'a, C> BidderAccountFilterSetCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17191,13 +16829,15 @@ impl<'a, C> BidderAccountFilterSetCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17448,25 +17088,15 @@ impl<'a, C> BidderAccountFilterSetDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17474,13 +17104,15 @@ impl<'a, C> BidderAccountFilterSetDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17715,25 +17347,15 @@ impl<'a, C> BidderAccountFilterSetGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17741,13 +17363,15 @@ impl<'a, C> BidderAccountFilterSetGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17992,25 +17616,15 @@ impl<'a, C> BidderAccountFilterSetListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18018,13 +17632,15 @@ impl<'a, C> BidderAccountFilterSetListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18283,25 +17899,15 @@ impl<'a, C> BidderFilterSetBidMetricListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18309,13 +17915,15 @@ impl<'a, C> BidderFilterSetBidMetricListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18574,25 +18182,15 @@ impl<'a, C> BidderFilterSetBidResponseErrorListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18600,13 +18198,15 @@ impl<'a, C> BidderFilterSetBidResponseErrorListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18865,25 +18465,15 @@ impl<'a, C> BidderFilterSetBidResponsesWithoutBidListCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18891,13 +18481,15 @@ impl<'a, C> BidderFilterSetBidResponsesWithoutBidListCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19156,25 +18748,15 @@ impl<'a, C> BidderFilterSetFilteredBidRequestListCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19182,13 +18764,15 @@ impl<'a, C> BidderFilterSetFilteredBidRequestListCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19449,25 +19033,15 @@ impl<'a, C> BidderFilterSetFilteredBidCreativeListCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19475,13 +19049,15 @@ impl<'a, C> BidderFilterSetFilteredBidCreativeListCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19752,25 +19328,15 @@ impl<'a, C> BidderFilterSetFilteredBidDetailListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19778,13 +19344,15 @@ impl<'a, C> BidderFilterSetFilteredBidDetailListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20053,25 +19621,15 @@ impl<'a, C> BidderFilterSetFilteredBidListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20079,13 +19637,15 @@ impl<'a, C> BidderFilterSetFilteredBidListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20344,25 +19904,15 @@ impl<'a, C> BidderFilterSetImpressionMetricListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20370,13 +19920,15 @@ impl<'a, C> BidderFilterSetImpressionMetricListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20635,25 +20187,15 @@ impl<'a, C> BidderFilterSetLosingBidListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20661,13 +20203,15 @@ impl<'a, C> BidderFilterSetLosingBidListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20926,25 +20470,15 @@ impl<'a, C> BidderFilterSetNonBillableWinningBidListCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20952,13 +20486,15 @@ impl<'a, C> BidderFilterSetNonBillableWinningBidListCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21233,25 +20769,15 @@ impl<'a, C> BidderFilterSetCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21259,13 +20785,15 @@ impl<'a, C> BidderFilterSetCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21516,25 +21044,15 @@ impl<'a, C> BidderFilterSetDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21542,13 +21060,15 @@ impl<'a, C> BidderFilterSetDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21783,25 +21303,15 @@ impl<'a, C> BidderFilterSetGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21809,13 +21319,15 @@ impl<'a, C> BidderFilterSetGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22060,25 +21572,15 @@ impl<'a, C> BidderFilterSetListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22086,13 +21588,15 @@ impl<'a, C> BidderFilterSetListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/adexchangebuyer2_v2_beta1/src/client.rs b/gen/adexchangebuyer2_v2_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/adexchangebuyer2_v2_beta1/src/client.rs +++ b/gen/adexchangebuyer2_v2_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/adexchangeseller2-cli/src/main.rs b/gen/adexchangeseller2-cli/src/main.rs index 8f76871949..8a3a6771e2 100644 --- a/gen/adexchangeseller2-cli/src/main.rs +++ b/gen/adexchangeseller2-cli/src/main.rs @@ -67,7 +67,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -234,7 +234,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -345,7 +345,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -631,7 +631,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["dimension", "max-results", "start-index", "locale", "filter", "metric", "sort"].iter().map(|v|*v)); + v.extend(["dimension", "filter", "locale", "max-results", "metric", "sort", "start-index"].iter().map(|v|*v)); v } )); } } @@ -758,7 +758,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -817,7 +817,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/adexchangeseller2/src/api.rs b/gen/adexchangeseller2/src/api.rs index e2fa77cde0..484996eb2d 100644 --- a/gen/adexchangeseller2/src/api.rs +++ b/gen/adexchangeseller2/src/api.rs @@ -1113,25 +1113,15 @@ impl<'a, C> AccountAdclientListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1139,13 +1129,15 @@ impl<'a, C> AccountAdclientListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1391,25 +1383,15 @@ impl<'a, C> AccountAlertListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1417,13 +1399,15 @@ impl<'a, C> AccountAlertListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1661,25 +1645,15 @@ impl<'a, C> AccountCustomchannelGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1687,13 +1661,15 @@ impl<'a, C> AccountCustomchannelGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1952,25 +1928,15 @@ impl<'a, C> AccountCustomchannelListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1978,13 +1944,15 @@ impl<'a, C> AccountCustomchannelListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2235,25 +2203,15 @@ impl<'a, C> AccountMetadataDimensionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2261,13 +2219,15 @@ impl<'a, C> AccountMetadataDimensionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2494,25 +2454,15 @@ impl<'a, C> AccountMetadataMetricListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2520,13 +2470,15 @@ impl<'a, C> AccountMetadataMetricListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2755,25 +2707,15 @@ impl<'a, C> AccountPreferreddealGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2781,13 +2723,15 @@ impl<'a, C> AccountPreferreddealGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3024,25 +2968,15 @@ impl<'a, C> AccountPreferreddealListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3050,13 +2984,15 @@ impl<'a, C> AccountPreferreddealListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3300,25 +3236,15 @@ impl<'a, C> AccountReportSavedGenerateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3326,13 +3252,15 @@ impl<'a, C> AccountReportSavedGenerateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3600,25 +3528,15 @@ impl<'a, C> AccountReportSavedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3626,13 +3544,15 @@ impl<'a, C> AccountReportSavedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3941,25 +3861,15 @@ impl<'a, C> AccountReportGenerateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3967,19 +3877,21 @@ impl<'a, C> AccountReportGenerateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = if enable_resource_parsing { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); } } - } else { (reconstructed_result, Default::default()) }; + } else { (res, Default::default()) }; dlg.finished(true); return Ok(result_value) @@ -4285,25 +4197,15 @@ impl<'a, C> AccountUrlchannelListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4311,13 +4213,15 @@ impl<'a, C> AccountUrlchannelListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4568,25 +4472,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4594,13 +4488,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4814,25 +4710,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4840,13 +4726,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/adexchangeseller2/src/client.rs b/gen/adexchangeseller2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/adexchangeseller2/src/client.rs +++ b/gen/adexchangeseller2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/adexperiencereport1/src/api.rs b/gen/adexperiencereport1/src/api.rs index a7feb92115..b419d9b2bd 100644 --- a/gen/adexperiencereport1/src/api.rs +++ b/gen/adexperiencereport1/src/api.rs @@ -473,25 +473,15 @@ impl<'a, C> SiteGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -499,13 +489,15 @@ impl<'a, C> SiteGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -682,25 +674,15 @@ impl<'a, C> ViolatingSiteListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -708,13 +690,15 @@ impl<'a, C> ViolatingSiteListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/adexperiencereport1/src/client.rs b/gen/adexperiencereport1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/adexperiencereport1/src/client.rs +++ b/gen/adexperiencereport1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/admob1-cli/src/main.rs b/gen/admob1-cli/src/main.rs index a14a6ee7f0..b14e85893e 100644 --- a/gen/admob1-cli/src/main.rs +++ b/gen/admob1-cli/src/main.rs @@ -119,7 +119,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/admob1/src/api.rs b/gen/admob1/src/api.rs index 9c4d917860..d3b2cdc442 100644 --- a/gen/admob1/src/api.rs +++ b/gen/admob1/src/api.rs @@ -880,25 +880,15 @@ impl<'a, C> AccountMediationReportGenerateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -906,13 +896,15 @@ impl<'a, C> AccountMediationReportGenerateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1177,25 +1169,15 @@ impl<'a, C> AccountNetworkReportGenerateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1203,13 +1185,15 @@ impl<'a, C> AccountNetworkReportGenerateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1453,25 +1437,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1479,13 +1453,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1703,25 +1679,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1729,13 +1695,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/admob1/src/client.rs b/gen/admob1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/admob1/src/client.rs +++ b/gen/admob1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/adsense1d4-cli/src/main.rs b/gen/adsense1d4-cli/src/main.rs index 29c6837bf9..9be9f437de 100644 --- a/gen/adsense1d4-cli/src/main.rs +++ b/gen/adsense1d4-cli/src/main.rs @@ -872,7 +872,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["dimension", "locale", "filter", "currency", "max-results", "start-index", "metric", "sort", "use-timezone-reporting"].iter().map(|v|*v)); + v.extend(["currency", "dimension", "filter", "locale", "max-results", "metric", "sort", "start-index", "use-timezone-reporting"].iter().map(|v|*v)); v } )); } } @@ -940,7 +940,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["locale", "start-index", "max-results"].iter().map(|v|*v)); + v.extend(["locale", "max-results", "start-index"].iter().map(|v|*v)); v } )); } } @@ -1969,7 +1969,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["dimension", "locale", "filter", "currency", "account-id", "max-results", "start-index", "metric", "sort", "use-timezone-reporting"].iter().map(|v|*v)); + v.extend(["account-id", "currency", "dimension", "filter", "locale", "max-results", "metric", "sort", "start-index", "use-timezone-reporting"].iter().map(|v|*v)); v } )); } } @@ -2037,7 +2037,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["locale", "start-index", "max-results"].iter().map(|v|*v)); + v.extend(["locale", "max-results", "start-index"].iter().map(|v|*v)); v } )); } } diff --git a/gen/adsense1d4/src/api.rs b/gen/adsense1d4/src/api.rs index 6a5eb096ff..51e3f74645 100644 --- a/gen/adsense1d4/src/api.rs +++ b/gen/adsense1d4/src/api.rs @@ -2329,25 +2329,15 @@ impl<'a, C> AccountAdclientGetAdCodeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2355,13 +2345,15 @@ impl<'a, C> AccountAdclientGetAdCodeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2615,25 +2607,15 @@ impl<'a, C> AccountAdclientListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2641,13 +2623,15 @@ impl<'a, C> AccountAdclientListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2902,25 +2886,15 @@ impl<'a, C> AccountAdunitCustomchannelListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2928,13 +2902,15 @@ impl<'a, C> AccountAdunitCustomchannelListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3199,25 +3175,15 @@ impl<'a, C> AccountAdunitGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3225,13 +3191,15 @@ impl<'a, C> AccountAdunitGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3482,25 +3450,15 @@ impl<'a, C> AccountAdunitGetAdCodeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3508,13 +3466,15 @@ impl<'a, C> AccountAdunitGetAdCodeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3778,25 +3738,15 @@ impl<'a, C> AccountAdunitListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3804,13 +3754,15 @@ impl<'a, C> AccountAdunitListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4069,25 +4021,15 @@ impl<'a, C> AccountAlertDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4095,11 +4037,11 @@ impl<'a, C> AccountAlertDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -4335,25 +4277,15 @@ impl<'a, C> AccountAlertListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4361,13 +4293,15 @@ impl<'a, C> AccountAlertListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4620,25 +4554,15 @@ impl<'a, C> AccountCustomchannelAdunitListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4646,13 +4570,15 @@ impl<'a, C> AccountCustomchannelAdunitListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4924,25 +4850,15 @@ impl<'a, C> AccountCustomchannelGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4950,13 +4866,15 @@ impl<'a, C> AccountCustomchannelGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5215,25 +5133,15 @@ impl<'a, C> AccountCustomchannelListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5241,13 +5149,15 @@ impl<'a, C> AccountCustomchannelListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5498,25 +5408,15 @@ impl<'a, C> AccountPaymentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5524,13 +5424,15 @@ impl<'a, C> AccountPaymentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5774,25 +5676,15 @@ impl<'a, C> AccountReportSavedGenerateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5800,13 +5692,15 @@ impl<'a, C> AccountReportSavedGenerateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6074,25 +5968,15 @@ impl<'a, C> AccountReportSavedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6100,13 +5984,15 @@ impl<'a, C> AccountReportSavedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6425,25 +6311,15 @@ impl<'a, C> AccountReportGenerateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6451,19 +6327,21 @@ impl<'a, C> AccountReportGenerateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = if enable_resource_parsing { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); } } - } else { (reconstructed_result, Default::default()) }; + } else { (res, Default::default()) }; dlg.finished(true); return Ok(result_value) @@ -6773,25 +6651,15 @@ impl<'a, C> AccountSavedadstyleGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6799,13 +6667,15 @@ impl<'a, C> AccountSavedadstyleGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7052,25 +6922,15 @@ impl<'a, C> AccountSavedadstyleListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7078,13 +6938,15 @@ impl<'a, C> AccountSavedadstyleListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7337,25 +7199,15 @@ impl<'a, C> AccountUrlchannelListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7363,13 +7215,15 @@ impl<'a, C> AccountUrlchannelListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7625,25 +7479,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7651,13 +7495,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7878,25 +7724,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7904,13 +7740,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8128,25 +7966,15 @@ impl<'a, C> AdclientListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8154,13 +7982,15 @@ impl<'a, C> AdclientListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8403,25 +8233,15 @@ impl<'a, C> AdunitCustomchannelListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8429,13 +8249,15 @@ impl<'a, C> AdunitCustomchannelListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8688,25 +8510,15 @@ impl<'a, C> AdunitGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8714,13 +8526,15 @@ impl<'a, C> AdunitGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8959,25 +8773,15 @@ impl<'a, C> AdunitGetAdCodeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8985,13 +8789,15 @@ impl<'a, C> AdunitGetAdCodeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9243,25 +9049,15 @@ impl<'a, C> AdunitListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9269,13 +9065,15 @@ impl<'a, C> AdunitListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9522,25 +9320,15 @@ impl<'a, C> AlertDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9548,11 +9336,11 @@ impl<'a, C> AlertDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -9755,25 +9543,15 @@ impl<'a, C> AlertListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9781,13 +9559,15 @@ impl<'a, C> AlertListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10028,25 +9808,15 @@ impl<'a, C> CustomchannelAdunitListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10054,13 +9824,15 @@ impl<'a, C> CustomchannelAdunitListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10320,25 +10092,15 @@ impl<'a, C> CustomchannelGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10346,13 +10108,15 @@ impl<'a, C> CustomchannelGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10599,25 +10363,15 @@ impl<'a, C> CustomchannelListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10625,13 +10379,15 @@ impl<'a, C> CustomchannelListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10849,25 +10605,15 @@ impl<'a, C> MetadataDimensionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10875,13 +10621,15 @@ impl<'a, C> MetadataDimensionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11075,25 +10823,15 @@ impl<'a, C> MetadataMetricListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11101,13 +10839,15 @@ impl<'a, C> MetadataMetricListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11301,25 +11041,15 @@ impl<'a, C> PaymentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11327,13 +11057,15 @@ impl<'a, C> PaymentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11565,25 +11297,15 @@ impl<'a, C> ReportSavedGenerateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11591,13 +11313,15 @@ impl<'a, C> ReportSavedGenerateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11832,25 +11556,15 @@ impl<'a, C> ReportSavedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11858,13 +11572,15 @@ impl<'a, C> ReportSavedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12157,25 +11873,15 @@ impl<'a, C> ReportGenerateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12183,19 +11889,21 @@ impl<'a, C> ReportGenerateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = if enable_resource_parsing { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); } } - } else { (reconstructed_result, Default::default()) }; + } else { (res, Default::default()) }; dlg.finished(true); return Ok(result_value) @@ -12501,25 +12209,15 @@ impl<'a, C> SavedadstyleGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12527,13 +12225,15 @@ impl<'a, C> SavedadstyleGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12747,25 +12447,15 @@ impl<'a, C> SavedadstyleListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12773,13 +12463,15 @@ impl<'a, C> SavedadstyleListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13020,25 +12712,15 @@ impl<'a, C> UrlchannelListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13046,13 +12728,15 @@ impl<'a, C> UrlchannelListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/adsense1d4/src/client.rs b/gen/adsense1d4/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/adsense1d4/src/client.rs +++ b/gen/adsense1d4/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/adsensehost4d1-cli/src/main.rs b/gen/adsensehost4d1-cli/src/main.rs index ff305bfe65..014e96bfb3 100644 --- a/gen/adsensehost4d1-cli/src/main.rs +++ b/gen/adsensehost4d1-cli/src/main.rs @@ -448,7 +448,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "include-inactive", "page-token"].iter().map(|v|*v)); + v.extend(["include-inactive", "max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -840,7 +840,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "dimension", "sort", "start-index", "filter", "metric", "locale"].iter().map(|v|*v)); + v.extend(["dimension", "filter", "locale", "max-results", "metric", "sort", "start-index"].iter().map(|v|*v)); v } )); } } @@ -1566,7 +1566,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "dimension", "sort", "start-index", "filter", "metric", "locale"].iter().map(|v|*v)); + v.extend(["dimension", "filter", "locale", "max-results", "metric", "sort", "start-index"].iter().map(|v|*v)); v } )); } } diff --git a/gen/adsensehost4d1/src/api.rs b/gen/adsensehost4d1/src/api.rs index 7824b625eb..ebda4f7a96 100644 --- a/gen/adsensehost4d1/src/api.rs +++ b/gen/adsensehost4d1/src/api.rs @@ -1635,25 +1635,15 @@ impl<'a, C> AccountAdclientGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1661,13 +1651,15 @@ impl<'a, C> AccountAdclientGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1914,25 +1906,15 @@ impl<'a, C> AccountAdclientListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1940,13 +1922,15 @@ impl<'a, C> AccountAdclientListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2191,25 +2175,15 @@ impl<'a, C> AccountAdunitDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2217,13 +2191,15 @@ impl<'a, C> AccountAdunitDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2474,25 +2450,15 @@ impl<'a, C> AccountAdunitGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2500,13 +2466,15 @@ impl<'a, C> AccountAdunitGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2764,25 +2732,15 @@ impl<'a, C> AccountAdunitGetAdCodeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2790,13 +2748,15 @@ impl<'a, C> AccountAdunitGetAdCodeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3074,25 +3034,15 @@ impl<'a, C> AccountAdunitInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3100,13 +3050,15 @@ impl<'a, C> AccountAdunitInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3369,25 +3321,15 @@ impl<'a, C> AccountAdunitListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3395,13 +3337,15 @@ impl<'a, C> AccountAdunitListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3684,25 +3628,15 @@ impl<'a, C> AccountAdunitPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3710,13 +3644,15 @@ impl<'a, C> AccountAdunitPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3995,25 +3931,15 @@ impl<'a, C> AccountAdunitUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4021,13 +3947,15 @@ impl<'a, C> AccountAdunitUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4320,25 +4248,15 @@ impl<'a, C> AccountReportGenerateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4346,13 +4264,15 @@ impl<'a, C> AccountReportGenerateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4652,25 +4572,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4678,13 +4588,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4894,25 +4806,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4920,13 +4822,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5154,25 +5058,15 @@ impl<'a, C> AdclientGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5180,13 +5074,15 @@ impl<'a, C> AdclientGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5400,25 +5296,15 @@ impl<'a, C> AdclientListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5426,13 +5312,15 @@ impl<'a, C> AdclientListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5663,25 +5551,15 @@ impl<'a, C> AssociationsessionStartCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5689,13 +5567,15 @@ impl<'a, C> AssociationsessionStartCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5933,25 +5813,15 @@ impl<'a, C> AssociationsessionVerifyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5959,13 +5829,15 @@ impl<'a, C> AssociationsessionVerifyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6194,25 +6066,15 @@ impl<'a, C> CustomchannelDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6220,13 +6082,15 @@ impl<'a, C> CustomchannelDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6465,25 +6329,15 @@ impl<'a, C> CustomchannelGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6491,13 +6345,15 @@ impl<'a, C> CustomchannelGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6755,25 +6611,15 @@ impl<'a, C> CustomchannelInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6781,13 +6627,15 @@ impl<'a, C> CustomchannelInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7033,25 +6881,15 @@ impl<'a, C> CustomchannelListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7059,13 +6897,15 @@ impl<'a, C> CustomchannelListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7329,25 +7169,15 @@ impl<'a, C> CustomchannelPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7355,13 +7185,15 @@ impl<'a, C> CustomchannelPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7628,25 +7460,15 @@ impl<'a, C> CustomchannelUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7654,13 +7476,15 @@ impl<'a, C> CustomchannelUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7920,25 +7744,15 @@ impl<'a, C> ReportGenerateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7946,13 +7760,15 @@ impl<'a, C> ReportGenerateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8244,25 +8060,15 @@ impl<'a, C> UrlchannelDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8270,13 +8076,15 @@ impl<'a, C> UrlchannelDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8534,25 +8342,15 @@ impl<'a, C> UrlchannelInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8560,13 +8358,15 @@ impl<'a, C> UrlchannelInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8812,25 +8612,15 @@ impl<'a, C> UrlchannelListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8838,13 +8628,15 @@ impl<'a, C> UrlchannelListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/adsensehost4d1/src/client.rs b/gen/adsensehost4d1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/adsensehost4d1/src/client.rs +++ b/gen/adsensehost4d1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/alertcenter1_beta1-cli/src/main.rs b/gen/alertcenter1_beta1-cli/src/main.rs index d0dfad95af..7314eb2b40 100644 --- a/gen/alertcenter1_beta1-cli/src/main.rs +++ b/gen/alertcenter1_beta1-cli/src/main.rs @@ -569,7 +569,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter", "customer-id", "order-by"].iter().map(|v|*v)); + v.extend(["customer-id", "filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/alertcenter1_beta1/src/api.rs b/gen/alertcenter1_beta1/src/api.rs index 874fba4fc8..30142c05ca 100644 --- a/gen/alertcenter1_beta1/src/api.rs +++ b/gen/alertcenter1_beta1/src/api.rs @@ -977,25 +977,15 @@ impl<'a, C> AlertFeedbackCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1003,13 +993,15 @@ impl<'a, C> AlertFeedbackCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1266,25 +1258,15 @@ impl<'a, C> AlertFeedbackListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1292,13 +1274,15 @@ impl<'a, C> AlertFeedbackListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1541,25 +1525,15 @@ impl<'a, C> AlertBatchDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1567,13 +1541,15 @@ impl<'a, C> AlertBatchDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1801,25 +1777,15 @@ impl<'a, C> AlertBatchUndeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1827,13 +1793,15 @@ impl<'a, C> AlertBatchUndeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2068,25 +2036,15 @@ impl<'a, C> AlertDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2094,13 +2052,15 @@ impl<'a, C> AlertDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2343,25 +2303,15 @@ impl<'a, C> AlertGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2369,13 +2319,15 @@ impl<'a, C> AlertGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2618,25 +2570,15 @@ impl<'a, C> AlertGetMetadataCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2644,13 +2586,15 @@ impl<'a, C> AlertGetMetadataCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2890,25 +2834,15 @@ impl<'a, C> AlertListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2916,13 +2850,15 @@ impl<'a, C> AlertListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3199,25 +3135,15 @@ impl<'a, C> AlertUndeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3225,13 +3151,15 @@ impl<'a, C> AlertUndeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3453,25 +3381,15 @@ impl<'a, C> MethodGetSettingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3479,13 +3397,15 @@ impl<'a, C> MethodGetSettingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3716,25 +3636,15 @@ impl<'a, C> MethodUpdateSettingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3742,13 +3652,15 @@ impl<'a, C> MethodUpdateSettingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/alertcenter1_beta1/src/client.rs b/gen/alertcenter1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/alertcenter1_beta1/src/client.rs +++ b/gen/alertcenter1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/analytics3-cli/src/main.rs b/gen/analytics3-cli/src/main.rs index 54cca13362..be95875a43 100644 --- a/gen/analytics3-cli/src/main.rs +++ b/gen/analytics3-cli/src/main.rs @@ -88,7 +88,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["output", "segment", "include-empty-rows", "sort", "sampling-level", "max-results", "filters", "dimensions", "start-index"].iter().map(|v|*v)); + v.extend(["dimensions", "filters", "include-empty-rows", "max-results", "output", "sampling-level", "segment", "sort", "start-index"].iter().map(|v|*v)); v } )); } } @@ -159,7 +159,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort", "max-results", "sampling-level", "filters", "dimensions", "start-index"].iter().map(|v|*v)); + v.extend(["dimensions", "filters", "max-results", "sampling-level", "sort", "start-index"].iter().map(|v|*v)); v } )); } } @@ -224,7 +224,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort", "max-results", "dimensions", "filters"].iter().map(|v|*v)); + v.extend(["dimensions", "filters", "max-results", "sort"].iter().map(|v|*v)); v } )); } } @@ -283,7 +283,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-index", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "start-index"].iter().map(|v|*v)); v } )); } } @@ -495,7 +495,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-index", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "start-index"].iter().map(|v|*v)); v } )); } } @@ -663,7 +663,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-index", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "start-index"].iter().map(|v|*v)); v } )); } } @@ -809,7 +809,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-index", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "start-index"].iter().map(|v|*v)); v } )); } } @@ -1017,7 +1017,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-index", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "start-index"].iter().map(|v|*v)); v } )); } } @@ -1430,7 +1430,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-index", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "start-index"].iter().map(|v|*v)); v } )); } } @@ -1905,7 +1905,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-index", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "start-index"].iter().map(|v|*v)); v } )); } } @@ -2420,7 +2420,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-index", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "start-index"].iter().map(|v|*v)); v } )); } } @@ -2895,7 +2895,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-index", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "start-index"].iter().map(|v|*v)); v } )); } } @@ -3366,7 +3366,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-index", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "start-index"].iter().map(|v|*v)); v } )); } } @@ -3778,7 +3778,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-index", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "start-index"].iter().map(|v|*v)); v } )); } } @@ -4154,7 +4154,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-index", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "start-index"].iter().map(|v|*v)); v } )); } } @@ -4643,7 +4643,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-index", "max-results", "type"].iter().map(|v|*v)); + v.extend(["max-results", "start-index", "type"].iter().map(|v|*v)); v } )); } } @@ -4916,7 +4916,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-index", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "start-index"].iter().map(|v|*v)); v } )); } } @@ -5175,7 +5175,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-index", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "start-index"].iter().map(|v|*v)); v } )); } } @@ -5363,7 +5363,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-index", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "start-index"].iter().map(|v|*v)); v } )); } } @@ -5668,7 +5668,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-index", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "start-index"].iter().map(|v|*v)); v } )); } } @@ -6074,7 +6074,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-index", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "start-index"].iter().map(|v|*v)); v } )); } } @@ -6496,7 +6496,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-index", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "start-index"].iter().map(|v|*v)); v } )); } } diff --git a/gen/analytics3/src/api.rs b/gen/analytics3/src/api.rs index a9d71a7c87..3d7ab8c860 100644 --- a/gen/analytics3/src/api.rs +++ b/gen/analytics3/src/api.rs @@ -5774,25 +5774,15 @@ impl<'a, C> DataGaGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5800,13 +5790,15 @@ impl<'a, C> DataGaGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6141,25 +6133,15 @@ impl<'a, C> DataMcfGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6167,13 +6149,15 @@ impl<'a, C> DataMcfGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6473,25 +6457,15 @@ impl<'a, C> DataRealtimeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6499,13 +6473,15 @@ impl<'a, C> DataRealtimeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6757,25 +6733,15 @@ impl<'a, C> ManagementAccountSummaryListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6783,13 +6749,15 @@ impl<'a, C> ManagementAccountSummaryListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7021,25 +6989,15 @@ impl<'a, C> ManagementAccountUserLinkDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7047,11 +7005,11 @@ impl<'a, C> ManagementAccountUserLinkDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -7303,25 +7261,15 @@ impl<'a, C> ManagementAccountUserLinkInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7329,13 +7277,15 @@ impl<'a, C> ManagementAccountUserLinkInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7581,25 +7531,15 @@ impl<'a, C> ManagementAccountUserLinkListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7607,13 +7547,15 @@ impl<'a, C> ManagementAccountUserLinkListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7877,25 +7819,15 @@ impl<'a, C> ManagementAccountUserLinkUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7903,13 +7835,15 @@ impl<'a, C> ManagementAccountUserLinkUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8142,25 +8076,15 @@ impl<'a, C> ManagementAccountListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8168,13 +8092,15 @@ impl<'a, C> ManagementAccountListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8403,25 +8329,15 @@ impl<'a, C> ManagementClientIdHashClientIdCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8429,13 +8345,15 @@ impl<'a, C> ManagementClientIdHashClientIdCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8673,25 +8591,15 @@ impl<'a, C> ManagementCustomDataSourceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8699,13 +8607,15 @@ impl<'a, C> ManagementCustomDataSourceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8960,25 +8870,15 @@ impl<'a, C> ManagementCustomDimensionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8986,13 +8886,15 @@ impl<'a, C> ManagementCustomDimensionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9262,25 +9164,15 @@ impl<'a, C> ManagementCustomDimensionInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9288,13 +9180,15 @@ impl<'a, C> ManagementCustomDimensionInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9552,25 +9446,15 @@ impl<'a, C> ManagementCustomDimensionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9578,13 +9462,15 @@ impl<'a, C> ManagementCustomDimensionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9865,25 +9751,15 @@ impl<'a, C> ManagementCustomDimensionPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9891,13 +9767,15 @@ impl<'a, C> ManagementCustomDimensionPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10190,25 +10068,15 @@ impl<'a, C> ManagementCustomDimensionUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10216,13 +10084,15 @@ impl<'a, C> ManagementCustomDimensionUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10489,25 +10359,15 @@ impl<'a, C> ManagementCustomMetricGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10515,13 +10375,15 @@ impl<'a, C> ManagementCustomMetricGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10791,25 +10653,15 @@ impl<'a, C> ManagementCustomMetricInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10817,13 +10669,15 @@ impl<'a, C> ManagementCustomMetricInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11081,25 +10935,15 @@ impl<'a, C> ManagementCustomMetricListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11107,13 +10951,15 @@ impl<'a, C> ManagementCustomMetricListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11394,25 +11240,15 @@ impl<'a, C> ManagementCustomMetricPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11420,13 +11256,15 @@ impl<'a, C> ManagementCustomMetricPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11719,25 +11557,15 @@ impl<'a, C> ManagementCustomMetricUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11745,13 +11573,15 @@ impl<'a, C> ManagementCustomMetricUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12019,25 +11849,15 @@ impl<'a, C> ManagementExperimentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12045,11 +11865,11 @@ impl<'a, C> ManagementExperimentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -12306,25 +12126,15 @@ impl<'a, C> ManagementExperimentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12332,13 +12142,15 @@ impl<'a, C> ManagementExperimentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12620,25 +12432,15 @@ impl<'a, C> ManagementExperimentInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12646,13 +12448,15 @@ impl<'a, C> ManagementExperimentInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12922,25 +12726,15 @@ impl<'a, C> ManagementExperimentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12948,13 +12742,15 @@ impl<'a, C> ManagementExperimentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13242,25 +13038,15 @@ impl<'a, C> ManagementExperimentPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13268,13 +13054,15 @@ impl<'a, C> ManagementExperimentPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13567,25 +13355,15 @@ impl<'a, C> ManagementExperimentUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13593,13 +13371,15 @@ impl<'a, C> ManagementExperimentUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13867,25 +13647,15 @@ impl<'a, C> ManagementFilterDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13893,13 +13663,15 @@ impl<'a, C> ManagementFilterDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14138,25 +13910,15 @@ impl<'a, C> ManagementFilterGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14164,13 +13926,15 @@ impl<'a, C> ManagementFilterGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14428,25 +14192,15 @@ impl<'a, C> ManagementFilterInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14454,13 +14208,15 @@ impl<'a, C> ManagementFilterInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14706,25 +14462,15 @@ impl<'a, C> ManagementFilterListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14732,13 +14478,15 @@ impl<'a, C> ManagementFilterListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15002,25 +14750,15 @@ impl<'a, C> ManagementFilterPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15028,13 +14766,15 @@ impl<'a, C> ManagementFilterPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15303,25 +15043,15 @@ impl<'a, C> ManagementFilterUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15329,13 +15059,15 @@ impl<'a, C> ManagementFilterUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15587,25 +15319,15 @@ impl<'a, C> ManagementGoalGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15613,13 +15335,15 @@ impl<'a, C> ManagementGoalGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15901,25 +15625,15 @@ impl<'a, C> ManagementGoalInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15927,13 +15641,15 @@ impl<'a, C> ManagementGoalInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16203,25 +15919,15 @@ impl<'a, C> ManagementGoalListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16229,13 +15935,15 @@ impl<'a, C> ManagementGoalListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16523,25 +16231,15 @@ impl<'a, C> ManagementGoalPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16549,13 +16247,15 @@ impl<'a, C> ManagementGoalPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16848,25 +16548,15 @@ impl<'a, C> ManagementGoalUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16874,13 +16564,15 @@ impl<'a, C> ManagementGoalUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17151,25 +16843,15 @@ impl<'a, C> ManagementProfileFilterLinkDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17177,11 +16859,11 @@ impl<'a, C> ManagementProfileFilterLinkDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -17438,25 +17120,15 @@ impl<'a, C> ManagementProfileFilterLinkGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17464,13 +17136,15 @@ impl<'a, C> ManagementProfileFilterLinkGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17752,25 +17426,15 @@ impl<'a, C> ManagementProfileFilterLinkInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17778,13 +17442,15 @@ impl<'a, C> ManagementProfileFilterLinkInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18054,25 +17720,15 @@ impl<'a, C> ManagementProfileFilterLinkListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18080,13 +17736,15 @@ impl<'a, C> ManagementProfileFilterLinkListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18374,25 +18032,15 @@ impl<'a, C> ManagementProfileFilterLinkPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18400,13 +18048,15 @@ impl<'a, C> ManagementProfileFilterLinkPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18699,25 +18349,15 @@ impl<'a, C> ManagementProfileFilterLinkUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18725,13 +18365,15 @@ impl<'a, C> ManagementProfileFilterLinkUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19002,25 +18644,15 @@ impl<'a, C> ManagementProfileUserLinkDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19028,11 +18660,11 @@ impl<'a, C> ManagementProfileUserLinkDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -19308,25 +18940,15 @@ impl<'a, C> ManagementProfileUserLinkInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19334,13 +18956,15 @@ impl<'a, C> ManagementProfileUserLinkInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19610,25 +19234,15 @@ impl<'a, C> ManagementProfileUserLinkListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19636,13 +19250,15 @@ impl<'a, C> ManagementProfileUserLinkListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19930,25 +19546,15 @@ impl<'a, C> ManagementProfileUserLinkUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19956,13 +19562,15 @@ impl<'a, C> ManagementProfileUserLinkUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20231,25 +19839,15 @@ impl<'a, C> ManagementProfileDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20257,11 +19855,11 @@ impl<'a, C> ManagementProfileDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -20506,25 +20104,15 @@ impl<'a, C> ManagementProfileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20532,13 +20120,15 @@ impl<'a, C> ManagementProfileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20808,25 +20398,15 @@ impl<'a, C> ManagementProfileInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20834,13 +20414,15 @@ impl<'a, C> ManagementProfileInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21098,25 +20680,15 @@ impl<'a, C> ManagementProfileListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21124,13 +20696,15 @@ impl<'a, C> ManagementProfileListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21406,25 +20980,15 @@ impl<'a, C> ManagementProfilePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21432,13 +20996,15 @@ impl<'a, C> ManagementProfilePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21719,25 +21285,15 @@ impl<'a, C> ManagementProfileUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21745,13 +21301,15 @@ impl<'a, C> ManagementProfileUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22010,25 +21568,15 @@ impl<'a, C> ManagementRemarketingAudienceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22036,11 +21584,11 @@ impl<'a, C> ManagementRemarketingAudienceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -22285,25 +21833,15 @@ impl<'a, C> ManagementRemarketingAudienceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22311,13 +21849,15 @@ impl<'a, C> ManagementRemarketingAudienceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22587,25 +22127,15 @@ impl<'a, C> ManagementRemarketingAudienceInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22613,13 +22143,15 @@ impl<'a, C> ManagementRemarketingAudienceInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22882,25 +22414,15 @@ impl<'a, C> ManagementRemarketingAudienceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22908,13 +22430,15 @@ impl<'a, C> ManagementRemarketingAudienceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23196,25 +22720,15 @@ impl<'a, C> ManagementRemarketingAudiencePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23222,13 +22736,15 @@ impl<'a, C> ManagementRemarketingAudiencePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23509,25 +23025,15 @@ impl<'a, C> ManagementRemarketingAudienceUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23535,13 +23041,15 @@ impl<'a, C> ManagementRemarketingAudienceUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23784,25 +23292,15 @@ impl<'a, C> ManagementSegmentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23810,13 +23308,15 @@ impl<'a, C> ManagementSegmentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24052,25 +23552,15 @@ impl<'a, C> ManagementUnsampledReportDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24078,11 +23568,11 @@ impl<'a, C> ManagementUnsampledReportDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -24339,25 +23829,15 @@ impl<'a, C> ManagementUnsampledReportGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24365,13 +23845,15 @@ impl<'a, C> ManagementUnsampledReportGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24653,25 +24135,15 @@ impl<'a, C> ManagementUnsampledReportInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24679,13 +24151,15 @@ impl<'a, C> ManagementUnsampledReportInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24955,25 +24429,15 @@ impl<'a, C> ManagementUnsampledReportListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24981,13 +24445,15 @@ impl<'a, C> ManagementUnsampledReportListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25272,25 +24738,15 @@ impl<'a, C> ManagementUploadDeleteUploadDataCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25298,11 +24754,11 @@ impl<'a, C> ManagementUploadDeleteUploadDataCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -25558,25 +25014,15 @@ impl<'a, C> ManagementUploadGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25584,13 +25030,15 @@ impl<'a, C> ManagementUploadGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25861,25 +25309,15 @@ impl<'a, C> ManagementUploadListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25887,13 +25325,15 @@ impl<'a, C> ManagementUploadListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26198,25 +25638,15 @@ impl<'a, C> ManagementUploadUploadDataCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26224,7 +25654,7 @@ impl<'a, C> ManagementUploadUploadDataCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -26236,7 +25666,7 @@ impl<'a, C> ManagementUploadUploadDataCall<'a, C> where C: BorrowMut ManagementUploadUploadDataCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26551,25 +25983,15 @@ impl<'a, C> ManagementWebPropertyAdWordsLinkDeleteCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26577,11 +25999,11 @@ impl<'a, C> ManagementWebPropertyAdWordsLinkDeleteCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -26826,25 +26248,15 @@ impl<'a, C> ManagementWebPropertyAdWordsLinkGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26852,13 +26264,15 @@ impl<'a, C> ManagementWebPropertyAdWordsLinkGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27128,25 +26542,15 @@ impl<'a, C> ManagementWebPropertyAdWordsLinkInsertCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27154,13 +26558,15 @@ impl<'a, C> ManagementWebPropertyAdWordsLinkInsertCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27418,25 +26824,15 @@ impl<'a, C> ManagementWebPropertyAdWordsLinkListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27444,13 +26840,15 @@ impl<'a, C> ManagementWebPropertyAdWordsLinkListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27726,25 +27124,15 @@ impl<'a, C> ManagementWebPropertyAdWordsLinkPatchCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27752,13 +27140,15 @@ impl<'a, C> ManagementWebPropertyAdWordsLinkPatchCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28039,25 +27429,15 @@ impl<'a, C> ManagementWebPropertyAdWordsLinkUpdateCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28065,13 +27445,15 @@ impl<'a, C> ManagementWebPropertyAdWordsLinkUpdateCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28329,25 +27711,15 @@ impl<'a, C> ManagementWebpropertyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28355,13 +27727,15 @@ impl<'a, C> ManagementWebpropertyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28619,25 +27993,15 @@ impl<'a, C> ManagementWebpropertyInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28645,13 +28009,15 @@ impl<'a, C> ManagementWebpropertyInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28897,25 +28263,15 @@ impl<'a, C> ManagementWebpropertyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28923,13 +28279,15 @@ impl<'a, C> ManagementWebpropertyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29193,25 +28551,15 @@ impl<'a, C> ManagementWebpropertyPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29219,13 +28567,15 @@ impl<'a, C> ManagementWebpropertyPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29494,25 +28844,15 @@ impl<'a, C> ManagementWebpropertyUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29520,13 +28860,15 @@ impl<'a, C> ManagementWebpropertyUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29775,25 +29117,15 @@ impl<'a, C> ManagementWebpropertyUserLinkDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29801,11 +29133,11 @@ impl<'a, C> ManagementWebpropertyUserLinkDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -30069,25 +29401,15 @@ impl<'a, C> ManagementWebpropertyUserLinkInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30095,13 +29417,15 @@ impl<'a, C> ManagementWebpropertyUserLinkInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30359,25 +29683,15 @@ impl<'a, C> ManagementWebpropertyUserLinkListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30385,13 +29699,15 @@ impl<'a, C> ManagementWebpropertyUserLinkListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30667,25 +29983,15 @@ impl<'a, C> ManagementWebpropertyUserLinkUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30693,13 +29999,15 @@ impl<'a, C> ManagementWebpropertyUserLinkUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30955,25 +30263,15 @@ impl<'a, C> MetadataColumnListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30981,13 +30279,15 @@ impl<'a, C> MetadataColumnListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31212,25 +30512,15 @@ impl<'a, C> ProvisioningCreateAccountTicketCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31238,13 +30528,15 @@ impl<'a, C> ProvisioningCreateAccountTicketCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31468,25 +30760,15 @@ impl<'a, C> ProvisioningCreateAccountTreeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31494,13 +30776,15 @@ impl<'a, C> ProvisioningCreateAccountTreeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31724,25 +31008,15 @@ impl<'a, C> UserDeletionUserDeletionRequestUpsertCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31750,13 +31024,15 @@ impl<'a, C> UserDeletionUserDeletionRequestUpsertCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/analytics3/src/client.rs b/gen/analytics3/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/analytics3/src/client.rs +++ b/gen/analytics3/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/analyticsadmin1_alpha-cli/src/main.rs b/gen/analyticsadmin1_alpha-cli/src/main.rs index fa848781e3..22da8147de 100644 --- a/gen/analyticsadmin1_alpha-cli/src/main.rs +++ b/gen/analyticsadmin1_alpha-cli/src/main.rs @@ -285,7 +285,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "show-deleted", "page-token"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "show-deleted"].iter().map(|v|*v)); v } )); } } @@ -2842,7 +2842,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "show-deleted", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token", "show-deleted"].iter().map(|v|*v)); v } )); } } diff --git a/gen/analyticsadmin1_alpha/src/api.rs b/gen/analyticsadmin1_alpha/src/api.rs index 3d3f350275..e90ca47e2f 100644 --- a/gen/analyticsadmin1_alpha/src/api.rs +++ b/gen/analyticsadmin1_alpha/src/api.rs @@ -2584,25 +2584,15 @@ impl<'a, C> AccountSummaryListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2610,13 +2600,15 @@ impl<'a, C> AccountSummaryListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2876,25 +2868,15 @@ impl<'a, C> AccountUserLinkAuditCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2902,13 +2884,15 @@ impl<'a, C> AccountUserLinkAuditCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3173,25 +3157,15 @@ impl<'a, C> AccountUserLinkBatchCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3199,13 +3173,15 @@ impl<'a, C> AccountUserLinkBatchCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3470,25 +3446,15 @@ impl<'a, C> AccountUserLinkBatchDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3496,13 +3462,15 @@ impl<'a, C> AccountUserLinkBatchDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3753,25 +3721,15 @@ impl<'a, C> AccountUserLinkBatchGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3779,13 +3737,15 @@ impl<'a, C> AccountUserLinkBatchGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4049,25 +4009,15 @@ impl<'a, C> AccountUserLinkBatchUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4075,13 +4025,15 @@ impl<'a, C> AccountUserLinkBatchUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4351,25 +4303,15 @@ impl<'a, C> AccountUserLinkCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4377,13 +4319,15 @@ impl<'a, C> AccountUserLinkCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4634,25 +4578,15 @@ impl<'a, C> AccountUserLinkDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4660,13 +4594,15 @@ impl<'a, C> AccountUserLinkDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4901,25 +4837,15 @@ impl<'a, C> AccountUserLinkGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4927,13 +4853,15 @@ impl<'a, C> AccountUserLinkGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5178,25 +5106,15 @@ impl<'a, C> AccountUserLinkListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5204,13 +5122,15 @@ impl<'a, C> AccountUserLinkListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5480,25 +5400,15 @@ impl<'a, C> AccountUserLinkPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5506,13 +5416,15 @@ impl<'a, C> AccountUserLinkPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5756,25 +5668,15 @@ impl<'a, C> AccountDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5782,13 +5684,15 @@ impl<'a, C> AccountDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6023,25 +5927,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6049,13 +5943,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6290,25 +6186,15 @@ impl<'a, C> AccountGetDataSharingSettingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6316,13 +6202,15 @@ impl<'a, C> AccountGetDataSharingSettingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6545,25 +6433,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6571,13 +6449,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6849,25 +6729,15 @@ impl<'a, C> AccountPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6875,13 +6745,15 @@ impl<'a, C> AccountPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7126,25 +6998,15 @@ impl<'a, C> AccountProvisionAccountTicketCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7152,13 +7014,15 @@ impl<'a, C> AccountProvisionAccountTicketCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7413,25 +7277,15 @@ impl<'a, C> AccountSearchChangeHistoryEventCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7439,13 +7293,15 @@ impl<'a, C> AccountSearchChangeHistoryEventCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7710,25 +7566,15 @@ impl<'a, C> PropertyAndroidAppDataStreamCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7736,13 +7582,15 @@ impl<'a, C> PropertyAndroidAppDataStreamCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7986,25 +7834,15 @@ impl<'a, C> PropertyAndroidAppDataStreamDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8012,13 +7850,15 @@ impl<'a, C> PropertyAndroidAppDataStreamDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8253,25 +8093,15 @@ impl<'a, C> PropertyAndroidAppDataStreamGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8279,13 +8109,15 @@ impl<'a, C> PropertyAndroidAppDataStreamGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8530,25 +8362,15 @@ impl<'a, C> PropertyAndroidAppDataStreamListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8556,13 +8378,15 @@ impl<'a, C> PropertyAndroidAppDataStreamListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8837,25 +8661,15 @@ impl<'a, C> PropertyAndroidAppDataStreamPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8863,13 +8677,15 @@ impl<'a, C> PropertyAndroidAppDataStreamPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9141,25 +8957,15 @@ impl<'a, C> PropertyFirebaseLinkCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9167,13 +8973,15 @@ impl<'a, C> PropertyFirebaseLinkCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9417,25 +9225,15 @@ impl<'a, C> PropertyFirebaseLinkDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9443,13 +9241,15 @@ impl<'a, C> PropertyFirebaseLinkDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9694,25 +9494,15 @@ impl<'a, C> PropertyFirebaseLinkListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9720,13 +9510,15 @@ impl<'a, C> PropertyFirebaseLinkListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10001,25 +9793,15 @@ impl<'a, C> PropertyFirebaseLinkPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10027,13 +9809,15 @@ impl<'a, C> PropertyFirebaseLinkPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10305,25 +10089,15 @@ impl<'a, C> PropertyGoogleAdsLinkCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10331,13 +10105,15 @@ impl<'a, C> PropertyGoogleAdsLinkCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10581,25 +10357,15 @@ impl<'a, C> PropertyGoogleAdsLinkDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10607,13 +10373,15 @@ impl<'a, C> PropertyGoogleAdsLinkDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10858,25 +10626,15 @@ impl<'a, C> PropertyGoogleAdsLinkListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10884,13 +10642,15 @@ impl<'a, C> PropertyGoogleAdsLinkListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11165,25 +10925,15 @@ impl<'a, C> PropertyGoogleAdsLinkPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11191,13 +10941,15 @@ impl<'a, C> PropertyGoogleAdsLinkPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11469,25 +11221,15 @@ impl<'a, C> PropertyIosAppDataStreamCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11495,13 +11237,15 @@ impl<'a, C> PropertyIosAppDataStreamCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11745,25 +11489,15 @@ impl<'a, C> PropertyIosAppDataStreamDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11771,13 +11505,15 @@ impl<'a, C> PropertyIosAppDataStreamDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12012,25 +11748,15 @@ impl<'a, C> PropertyIosAppDataStreamGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12038,13 +11764,15 @@ impl<'a, C> PropertyIosAppDataStreamGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12289,25 +12017,15 @@ impl<'a, C> PropertyIosAppDataStreamListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12315,13 +12033,15 @@ impl<'a, C> PropertyIosAppDataStreamListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12596,25 +12316,15 @@ impl<'a, C> PropertyIosAppDataStreamPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12622,13 +12332,15 @@ impl<'a, C> PropertyIosAppDataStreamPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12900,25 +12612,15 @@ impl<'a, C> PropertyUserLinkAuditCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12926,13 +12628,15 @@ impl<'a, C> PropertyUserLinkAuditCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13197,25 +12901,15 @@ impl<'a, C> PropertyUserLinkBatchCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13223,13 +12917,15 @@ impl<'a, C> PropertyUserLinkBatchCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13494,25 +13190,15 @@ impl<'a, C> PropertyUserLinkBatchDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13520,13 +13206,15 @@ impl<'a, C> PropertyUserLinkBatchDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13777,25 +13465,15 @@ impl<'a, C> PropertyUserLinkBatchGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13803,13 +13481,15 @@ impl<'a, C> PropertyUserLinkBatchGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14073,25 +13753,15 @@ impl<'a, C> PropertyUserLinkBatchUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14099,13 +13769,15 @@ impl<'a, C> PropertyUserLinkBatchUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14375,25 +14047,15 @@ impl<'a, C> PropertyUserLinkCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14401,13 +14063,15 @@ impl<'a, C> PropertyUserLinkCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14658,25 +14322,15 @@ impl<'a, C> PropertyUserLinkDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14684,13 +14338,15 @@ impl<'a, C> PropertyUserLinkDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14925,25 +14581,15 @@ impl<'a, C> PropertyUserLinkGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14951,13 +14597,15 @@ impl<'a, C> PropertyUserLinkGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15202,25 +14850,15 @@ impl<'a, C> PropertyUserLinkListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15228,13 +14866,15 @@ impl<'a, C> PropertyUserLinkListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15504,25 +15144,15 @@ impl<'a, C> PropertyUserLinkPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15530,13 +15160,15 @@ impl<'a, C> PropertyUserLinkPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15801,25 +15433,15 @@ impl<'a, C> PropertyWebDataStreamCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15827,13 +15449,15 @@ impl<'a, C> PropertyWebDataStreamCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16077,25 +15701,15 @@ impl<'a, C> PropertyWebDataStreamDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16103,13 +15717,15 @@ impl<'a, C> PropertyWebDataStreamDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16344,25 +15960,15 @@ impl<'a, C> PropertyWebDataStreamGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16370,13 +15976,15 @@ impl<'a, C> PropertyWebDataStreamGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16611,25 +16219,15 @@ impl<'a, C> PropertyWebDataStreamGetEnhancedMeasurementSettingCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16637,13 +16235,15 @@ impl<'a, C> PropertyWebDataStreamGetEnhancedMeasurementSettingCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16878,25 +16478,15 @@ impl<'a, C> PropertyWebDataStreamGetGlobalSiteTagCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16904,13 +16494,15 @@ impl<'a, C> PropertyWebDataStreamGetGlobalSiteTagCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17155,25 +16747,15 @@ impl<'a, C> PropertyWebDataStreamListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17181,13 +16763,15 @@ impl<'a, C> PropertyWebDataStreamListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17462,25 +17046,15 @@ impl<'a, C> PropertyWebDataStreamPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17488,13 +17062,15 @@ impl<'a, C> PropertyWebDataStreamPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17771,25 +17347,15 @@ impl<'a, C> PropertyWebDataStreamUpdateEnhancedMeasurementSettingCall<'a, C> whe return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17797,13 +17363,15 @@ impl<'a, C> PropertyWebDataStreamUpdateEnhancedMeasurementSettingCall<'a, C> whe } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18048,25 +17616,15 @@ impl<'a, C> PropertyCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18074,13 +17632,15 @@ impl<'a, C> PropertyCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18314,25 +17874,15 @@ impl<'a, C> PropertyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18340,13 +17890,15 @@ impl<'a, C> PropertyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18581,25 +18133,15 @@ impl<'a, C> PropertyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18607,13 +18149,15 @@ impl<'a, C> PropertyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18841,25 +18385,15 @@ impl<'a, C> PropertyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18867,13 +18401,15 @@ impl<'a, C> PropertyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19152,25 +18688,15 @@ impl<'a, C> PropertyPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19178,13 +18704,15 @@ impl<'a, C> PropertyPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/analyticsadmin1_alpha/src/client.rs b/gen/analyticsadmin1_alpha/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/analyticsadmin1_alpha/src/client.rs +++ b/gen/analyticsadmin1_alpha/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/analyticsdata1_beta/src/api.rs b/gen/analyticsdata1_beta/src/api.rs index e1c60a3f6d..74818bf382 100644 --- a/gen/analyticsdata1_beta/src/api.rs +++ b/gen/analyticsdata1_beta/src/api.rs @@ -1482,25 +1482,15 @@ impl<'a, C> PropertyBatchRunPivotReportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1508,13 +1498,15 @@ impl<'a, C> PropertyBatchRunPivotReportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1779,25 +1771,15 @@ impl<'a, C> PropertyBatchRunReportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1805,13 +1787,15 @@ impl<'a, C> PropertyBatchRunReportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2055,25 +2039,15 @@ impl<'a, C> PropertyGetMetadataCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2081,13 +2055,15 @@ impl<'a, C> PropertyGetMetadataCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2343,25 +2319,15 @@ impl<'a, C> PropertyRunPivotReportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2369,13 +2335,15 @@ impl<'a, C> PropertyRunPivotReportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2640,25 +2608,15 @@ impl<'a, C> PropertyRunRealtimeReportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2666,13 +2624,15 @@ impl<'a, C> PropertyRunRealtimeReportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2937,25 +2897,15 @@ impl<'a, C> PropertyRunReportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2963,13 +2913,15 @@ impl<'a, C> PropertyRunReportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/analyticsdata1_beta/src/client.rs b/gen/analyticsdata1_beta/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/analyticsdata1_beta/src/client.rs +++ b/gen/analyticsdata1_beta/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/analyticsreporting4/src/api.rs b/gen/analyticsreporting4/src/api.rs index 3ca6318e56..433f3f7c3c 100644 --- a/gen/analyticsreporting4/src/api.rs +++ b/gen/analyticsreporting4/src/api.rs @@ -1498,25 +1498,15 @@ impl<'a, C> ReportBatchGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1524,13 +1514,15 @@ impl<'a, C> ReportBatchGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1758,25 +1750,15 @@ impl<'a, C> UserActivitySearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1784,13 +1766,15 @@ impl<'a, C> UserActivitySearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/analyticsreporting4/src/client.rs b/gen/analyticsreporting4/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/analyticsreporting4/src/client.rs +++ b/gen/analyticsreporting4/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/androiddeviceprovisioning1/src/api.rs b/gen/androiddeviceprovisioning1/src/api.rs index 3c39cd2298..69f28fa316 100644 --- a/gen/androiddeviceprovisioning1/src/api.rs +++ b/gen/androiddeviceprovisioning1/src/api.rs @@ -1723,25 +1723,15 @@ impl<'a, C> CustomerConfigurationCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1749,13 +1739,15 @@ impl<'a, C> CustomerConfigurationCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1968,25 +1960,15 @@ impl<'a, C> CustomerConfigurationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1994,13 +1976,15 @@ impl<'a, C> CustomerConfigurationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2204,25 +2188,15 @@ impl<'a, C> CustomerConfigurationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2230,13 +2204,15 @@ impl<'a, C> CustomerConfigurationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2440,25 +2416,15 @@ impl<'a, C> CustomerConfigurationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2466,13 +2432,15 @@ impl<'a, C> CustomerConfigurationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2702,25 +2670,15 @@ impl<'a, C> CustomerConfigurationPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2728,13 +2686,15 @@ impl<'a, C> CustomerConfigurationPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2975,25 +2935,15 @@ impl<'a, C> CustomerDeviceApplyConfigurationCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3001,13 +2951,15 @@ impl<'a, C> CustomerDeviceApplyConfigurationCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3220,25 +3172,15 @@ impl<'a, C> CustomerDeviceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3246,13 +3188,15 @@ impl<'a, C> CustomerDeviceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3466,25 +3410,15 @@ impl<'a, C> CustomerDeviceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3492,13 +3426,15 @@ impl<'a, C> CustomerDeviceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3737,25 +3673,15 @@ impl<'a, C> CustomerDeviceRemoveConfigurationCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3763,13 +3689,15 @@ impl<'a, C> CustomerDeviceRemoveConfigurationCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4003,25 +3931,15 @@ impl<'a, C> CustomerDeviceUnclaimCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4029,13 +3947,15 @@ impl<'a, C> CustomerDeviceUnclaimCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4248,25 +4168,15 @@ impl<'a, C> CustomerDpcListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4274,13 +4184,15 @@ impl<'a, C> CustomerDpcListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4467,25 +4379,15 @@ impl<'a, C> CustomerListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4493,13 +4395,15 @@ impl<'a, C> CustomerListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4707,25 +4611,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4733,13 +4627,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4964,25 +4860,15 @@ impl<'a, C> PartnerCustomerCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4990,13 +4876,15 @@ impl<'a, C> PartnerCustomerCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5219,25 +5107,15 @@ impl<'a, C> PartnerCustomerListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5245,13 +5123,15 @@ impl<'a, C> PartnerCustomerListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5490,25 +5370,15 @@ impl<'a, C> PartnerDeviceClaimCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5516,13 +5386,15 @@ impl<'a, C> PartnerDeviceClaimCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5756,25 +5628,15 @@ impl<'a, C> PartnerDeviceClaimAsyncCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5782,13 +5644,15 @@ impl<'a, C> PartnerDeviceClaimAsyncCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6022,25 +5886,15 @@ impl<'a, C> PartnerDeviceFindByIdentifierCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6048,13 +5902,15 @@ impl<'a, C> PartnerDeviceFindByIdentifierCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6288,25 +6144,15 @@ impl<'a, C> PartnerDeviceFindByOwnerCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6314,13 +6160,15 @@ impl<'a, C> PartnerDeviceFindByOwnerCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6533,25 +6381,15 @@ impl<'a, C> PartnerDeviceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6559,13 +6397,15 @@ impl<'a, C> PartnerDeviceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6792,25 +6632,15 @@ impl<'a, C> PartnerDeviceMetadataCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6818,13 +6648,15 @@ impl<'a, C> PartnerDeviceMetadataCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7068,25 +6900,15 @@ impl<'a, C> PartnerDeviceUnclaimCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7094,13 +6916,15 @@ impl<'a, C> PartnerDeviceUnclaimCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7334,25 +7158,15 @@ impl<'a, C> PartnerDeviceUnclaimAsyncCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7360,13 +7174,15 @@ impl<'a, C> PartnerDeviceUnclaimAsyncCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7600,25 +7416,15 @@ impl<'a, C> PartnerDeviceUpdateMetadataAsyncCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7626,13 +7432,15 @@ impl<'a, C> PartnerDeviceUpdateMetadataAsyncCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7855,25 +7663,15 @@ impl<'a, C> PartnerVendorCustomerListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7881,13 +7679,15 @@ impl<'a, C> PartnerVendorCustomerListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8115,25 +7915,15 @@ impl<'a, C> PartnerVendorListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8141,13 +7931,15 @@ impl<'a, C> PartnerVendorListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/androiddeviceprovisioning1/src/client.rs b/gen/androiddeviceprovisioning1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/androiddeviceprovisioning1/src/client.rs +++ b/gen/androiddeviceprovisioning1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/androidenterprise1-cli/src/main.rs b/gen/androidenterprise1-cli/src/main.rs index 1111be3ee9..9de44fb552 100644 --- a/gen/androidenterprise1-cli/src/main.rs +++ b/gen/androidenterprise1-cli/src/main.rs @@ -2839,7 +2839,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["approved", "query", "language", "max-results", "token"].iter().map(|v|*v)); + v.extend(["approved", "language", "max-results", "query", "token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/androidenterprise1/src/api.rs b/gen/androidenterprise1/src/api.rs index 96905525f4..a1ef6d5270 100644 --- a/gen/androidenterprise1/src/api.rs +++ b/gen/androidenterprise1/src/api.rs @@ -4373,25 +4373,15 @@ impl<'a, C> DeviceForceReportUploadCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4399,11 +4389,11 @@ impl<'a, C> DeviceForceReportUploadCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -4652,25 +4642,15 @@ impl<'a, C> DeviceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4678,13 +4658,15 @@ impl<'a, C> DeviceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4939,25 +4921,15 @@ impl<'a, C> DeviceGetStateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4965,13 +4937,15 @@ impl<'a, C> DeviceGetStateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5224,25 +5198,15 @@ impl<'a, C> DeviceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5250,13 +5214,15 @@ impl<'a, C> DeviceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5522,25 +5488,15 @@ impl<'a, C> DeviceSetStateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5548,13 +5504,15 @@ impl<'a, C> DeviceSetStateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5844,25 +5802,15 @@ impl<'a, C> DeviceUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5870,13 +5818,15 @@ impl<'a, C> DeviceUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6124,25 +6074,15 @@ impl<'a, C> EnterpriseAcknowledgeNotificationSetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6150,11 +6090,11 @@ impl<'a, C> EnterpriseAcknowledgeNotificationSetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -6363,25 +6303,15 @@ impl<'a, C> EnterpriseCompleteSignupCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6389,13 +6319,15 @@ impl<'a, C> EnterpriseCompleteSignupCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6651,25 +6583,15 @@ impl<'a, C> EnterpriseCreateWebTokenCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6677,13 +6599,15 @@ impl<'a, C> EnterpriseCreateWebTokenCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6923,25 +6847,15 @@ impl<'a, C> EnterpriseEnrollCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6949,13 +6863,15 @@ impl<'a, C> EnterpriseEnrollCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7177,25 +7093,15 @@ impl<'a, C> EnterpriseGenerateSignupUrlCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7203,13 +7109,15 @@ impl<'a, C> EnterpriseGenerateSignupUrlCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7437,25 +7345,15 @@ impl<'a, C> EnterpriseGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7463,13 +7361,15 @@ impl<'a, C> EnterpriseGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7705,25 +7605,15 @@ impl<'a, C> EnterpriseGetServiceAccountCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7731,13 +7621,15 @@ impl<'a, C> EnterpriseGetServiceAccountCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7975,25 +7867,15 @@ impl<'a, C> EnterpriseGetStoreLayoutCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8001,13 +7883,15 @@ impl<'a, C> EnterpriseGetStoreLayoutCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8217,25 +8101,15 @@ impl<'a, C> EnterpriseListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8243,13 +8117,15 @@ impl<'a, C> EnterpriseListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8462,25 +8338,15 @@ impl<'a, C> EnterprisePullNotificationSetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8488,13 +8354,15 @@ impl<'a, C> EnterprisePullNotificationSetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8722,25 +8590,15 @@ impl<'a, C> EnterpriseSendTestPushNotificationCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8748,13 +8606,15 @@ impl<'a, C> EnterpriseSendTestPushNotificationCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9006,25 +8866,15 @@ impl<'a, C> EnterpriseSetAccountCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9032,13 +8882,15 @@ impl<'a, C> EnterpriseSetAccountCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9299,25 +9151,15 @@ impl<'a, C> EnterpriseSetStoreLayoutCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9325,13 +9167,15 @@ impl<'a, C> EnterpriseSetStoreLayoutCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9570,25 +9414,15 @@ impl<'a, C> EnterpriseUnenrollCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9596,11 +9430,11 @@ impl<'a, C> EnterpriseUnenrollCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -9828,25 +9662,15 @@ impl<'a, C> EntitlementDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9854,11 +9678,11 @@ impl<'a, C> EntitlementDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -10107,25 +9931,15 @@ impl<'a, C> EntitlementGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10133,13 +9947,15 @@ impl<'a, C> EntitlementGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10392,25 +10208,15 @@ impl<'a, C> EntitlementListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10418,13 +10224,15 @@ impl<'a, C> EntitlementListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10695,25 +10503,15 @@ impl<'a, C> EntitlementUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10721,13 +10519,15 @@ impl<'a, C> EntitlementUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10996,25 +10796,15 @@ impl<'a, C> GrouplicenseGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11022,13 +10812,15 @@ impl<'a, C> GrouplicenseGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11269,25 +11061,15 @@ impl<'a, C> GrouplicenseListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11295,13 +11077,15 @@ impl<'a, C> GrouplicenseListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11534,25 +11318,15 @@ impl<'a, C> GrouplicenseuserListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11560,13 +11334,15 @@ impl<'a, C> GrouplicenseuserListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11812,25 +11588,15 @@ impl<'a, C> InstallDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11838,11 +11604,11 @@ impl<'a, C> InstallDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -12103,25 +11869,15 @@ impl<'a, C> InstallGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12129,13 +11885,15 @@ impl<'a, C> InstallGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12400,25 +12158,15 @@ impl<'a, C> InstallListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12426,13 +12174,15 @@ impl<'a, C> InstallListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12710,25 +12460,15 @@ impl<'a, C> InstallUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12736,13 +12476,15 @@ impl<'a, C> InstallUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13017,25 +12759,15 @@ impl<'a, C> ManagedconfigurationsfordeviceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13043,11 +12775,11 @@ impl<'a, C> ManagedconfigurationsfordeviceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -13308,25 +13040,15 @@ impl<'a, C> ManagedconfigurationsfordeviceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13334,13 +13056,15 @@ impl<'a, C> ManagedconfigurationsfordeviceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13605,25 +13329,15 @@ impl<'a, C> ManagedconfigurationsfordeviceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13631,13 +13345,15 @@ impl<'a, C> ManagedconfigurationsfordeviceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13915,25 +13631,15 @@ impl<'a, C> ManagedconfigurationsfordeviceUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13941,13 +13647,15 @@ impl<'a, C> ManagedconfigurationsfordeviceUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14220,25 +13928,15 @@ impl<'a, C> ManagedconfigurationsforuserDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14246,11 +13944,11 @@ impl<'a, C> ManagedconfigurationsforuserDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -14499,25 +14197,15 @@ impl<'a, C> ManagedconfigurationsforuserGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14525,13 +14213,15 @@ impl<'a, C> ManagedconfigurationsforuserGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14784,25 +14474,15 @@ impl<'a, C> ManagedconfigurationsforuserListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14810,13 +14490,15 @@ impl<'a, C> ManagedconfigurationsforuserListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15082,25 +14764,15 @@ impl<'a, C> ManagedconfigurationsforuserUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15108,13 +14780,15 @@ impl<'a, C> ManagedconfigurationsforuserUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15376,25 +15050,15 @@ impl<'a, C> ManagedconfigurationssettingListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15402,13 +15066,15 @@ impl<'a, C> ManagedconfigurationssettingListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15654,25 +15320,15 @@ impl<'a, C> PermissionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15680,13 +15336,15 @@ impl<'a, C> PermissionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15946,25 +15604,15 @@ impl<'a, C> ProductApproveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15972,11 +15620,11 @@ impl<'a, C> ProductApproveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -16227,25 +15875,15 @@ impl<'a, C> ProductGenerateApprovalUrlCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16253,13 +15891,15 @@ impl<'a, C> ProductGenerateApprovalUrlCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16514,25 +16154,15 @@ impl<'a, C> ProductGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16540,13 +16170,15 @@ impl<'a, C> ProductGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16801,25 +16433,15 @@ impl<'a, C> ProductGetAppRestrictionsSchemaCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16827,13 +16449,15 @@ impl<'a, C> ProductGetAppRestrictionsSchemaCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17083,25 +16707,15 @@ impl<'a, C> ProductGetPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17109,13 +16723,15 @@ impl<'a, C> ProductGetPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17381,25 +16997,15 @@ impl<'a, C> ProductListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17407,13 +17013,15 @@ impl<'a, C> ProductListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17680,25 +17288,15 @@ impl<'a, C> ProductUnapproveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17706,11 +17304,11 @@ impl<'a, C> ProductUnapproveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -17946,25 +17544,15 @@ impl<'a, C> ServiceaccountkeyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17972,11 +17560,11 @@ impl<'a, C> ServiceaccountkeyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -18232,25 +17820,15 @@ impl<'a, C> ServiceaccountkeyInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18258,13 +17836,15 @@ impl<'a, C> ServiceaccountkeyInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18504,25 +18084,15 @@ impl<'a, C> ServiceaccountkeyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18530,13 +18100,15 @@ impl<'a, C> ServiceaccountkeyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18770,25 +18342,15 @@ impl<'a, C> StorelayoutclusterDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18796,11 +18358,11 @@ impl<'a, C> StorelayoutclusterDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -19049,25 +18611,15 @@ impl<'a, C> StorelayoutclusterGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19075,13 +18627,15 @@ impl<'a, C> StorelayoutclusterGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19355,25 +18909,15 @@ impl<'a, C> StorelayoutclusterInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19381,13 +18925,15 @@ impl<'a, C> StorelayoutclusterInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19639,25 +19185,15 @@ impl<'a, C> StorelayoutclusterListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19665,13 +19201,15 @@ impl<'a, C> StorelayoutclusterListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19937,25 +19475,15 @@ impl<'a, C> StorelayoutclusterUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19963,13 +19491,15 @@ impl<'a, C> StorelayoutclusterUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20230,25 +19760,15 @@ impl<'a, C> StorelayoutpageDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20256,11 +19776,11 @@ impl<'a, C> StorelayoutpageDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -20497,25 +20017,15 @@ impl<'a, C> StorelayoutpageGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20523,13 +20033,15 @@ impl<'a, C> StorelayoutpageGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20791,25 +20303,15 @@ impl<'a, C> StorelayoutpageInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20817,13 +20319,15 @@ impl<'a, C> StorelayoutpageInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21063,25 +20567,15 @@ impl<'a, C> StorelayoutpageListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21089,13 +20583,15 @@ impl<'a, C> StorelayoutpageListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21349,25 +20845,15 @@ impl<'a, C> StorelayoutpageUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21375,13 +20861,15 @@ impl<'a, C> StorelayoutpageUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21632,25 +21120,15 @@ impl<'a, C> UserDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21658,11 +21136,11 @@ impl<'a, C> UserDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -21899,25 +21377,15 @@ impl<'a, C> UserGenerateAuthenticationTokenCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21925,13 +21393,15 @@ impl<'a, C> UserGenerateAuthenticationTokenCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22174,25 +21644,15 @@ impl<'a, C> UserGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22200,13 +21660,15 @@ impl<'a, C> UserGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22449,25 +21911,15 @@ impl<'a, C> UserGetAvailableProductSetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22475,13 +21927,15 @@ impl<'a, C> UserGetAvailableProductSetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22743,25 +22197,15 @@ impl<'a, C> UserInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22769,13 +22213,15 @@ impl<'a, C> UserInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23017,25 +22463,15 @@ impl<'a, C> UserListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23043,13 +22479,15 @@ impl<'a, C> UserListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23291,25 +22729,15 @@ impl<'a, C> UserRevokeDeviceAccesCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23317,11 +22745,11 @@ impl<'a, C> UserRevokeDeviceAccesCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -23579,25 +23007,15 @@ impl<'a, C> UserSetAvailableProductSetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23605,13 +23023,15 @@ impl<'a, C> UserSetAvailableProductSetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23884,25 +23304,15 @@ impl<'a, C> UserUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23910,13 +23320,15 @@ impl<'a, C> UserUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24167,25 +23579,15 @@ impl<'a, C> WebappDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24193,11 +23595,11 @@ impl<'a, C> WebappDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -24434,25 +23836,15 @@ impl<'a, C> WebappGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24460,13 +23852,15 @@ impl<'a, C> WebappGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24728,25 +24122,15 @@ impl<'a, C> WebappInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24754,13 +24138,15 @@ impl<'a, C> WebappInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25000,25 +24386,15 @@ impl<'a, C> WebappListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25026,13 +24402,15 @@ impl<'a, C> WebappListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25286,25 +24664,15 @@ impl<'a, C> WebappUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25312,13 +24680,15 @@ impl<'a, C> WebappUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/androidenterprise1/src/client.rs b/gen/androidenterprise1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/androidenterprise1/src/client.rs +++ b/gen/androidenterprise1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/androidmanagement1-cli/src/main.rs b/gen/androidmanagement1-cli/src/main.rs index aceb6fba8f..ca1638eafb 100644 --- a/gen/androidmanagement1-cli/src/main.rs +++ b/gen/androidmanagement1-cli/src/main.rs @@ -176,7 +176,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["project-id", "agreement-accepted", "signup-url-name", "enterprise-token"].iter().map(|v|*v)); + v.extend(["agreement-accepted", "enterprise-token", "project-id", "signup-url-name"].iter().map(|v|*v)); v } )); } } @@ -489,7 +489,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -707,7 +707,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1121,7 +1121,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["project-id", "view", "page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "project-id", "view"].iter().map(|v|*v)); v } )); } } @@ -1387,7 +1387,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1840,7 +1840,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2081,7 +2081,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["project-id", "callback-url"].iter().map(|v|*v)); + v.extend(["callback-url", "project-id"].iter().map(|v|*v)); v } )); } } diff --git a/gen/androidmanagement1/src/api.rs b/gen/androidmanagement1/src/api.rs index 755a43f163..8984a17af7 100644 --- a/gen/androidmanagement1/src/api.rs +++ b/gen/androidmanagement1/src/api.rs @@ -3009,25 +3009,15 @@ impl<'a, C> EnterpriseApplicationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3035,13 +3025,15 @@ impl<'a, C> EnterpriseApplicationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3283,25 +3275,15 @@ impl<'a, C> EnterpriseDeviceOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3309,13 +3291,15 @@ impl<'a, C> EnterpriseDeviceOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3550,25 +3534,15 @@ impl<'a, C> EnterpriseDeviceOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3576,13 +3550,15 @@ impl<'a, C> EnterpriseDeviceOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3817,25 +3793,15 @@ impl<'a, C> EnterpriseDeviceOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3843,13 +3809,15 @@ impl<'a, C> EnterpriseDeviceOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4099,25 +4067,15 @@ impl<'a, C> EnterpriseDeviceOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4125,13 +4083,15 @@ impl<'a, C> EnterpriseDeviceOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4399,25 +4359,15 @@ impl<'a, C> EnterpriseDeviceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4425,13 +4375,15 @@ impl<'a, C> EnterpriseDeviceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4681,25 +4633,15 @@ impl<'a, C> EnterpriseDeviceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4707,13 +4649,15 @@ impl<'a, C> EnterpriseDeviceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4969,25 +4913,15 @@ impl<'a, C> EnterpriseDeviceIssueCommandCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4995,13 +4929,15 @@ impl<'a, C> EnterpriseDeviceIssueCommandCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5255,25 +5191,15 @@ impl<'a, C> EnterpriseDeviceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5281,13 +5207,15 @@ impl<'a, C> EnterpriseDeviceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5562,25 +5490,15 @@ impl<'a, C> EnterpriseDevicePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5588,13 +5506,15 @@ impl<'a, C> EnterpriseDevicePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5866,25 +5786,15 @@ impl<'a, C> EnterpriseEnrollmentTokenCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5892,13 +5802,15 @@ impl<'a, C> EnterpriseEnrollmentTokenCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6142,25 +6054,15 @@ impl<'a, C> EnterpriseEnrollmentTokenDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6168,13 +6070,15 @@ impl<'a, C> EnterpriseEnrollmentTokenDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6409,25 +6313,15 @@ impl<'a, C> EnterprisePolicyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6435,13 +6329,15 @@ impl<'a, C> EnterprisePolicyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6676,25 +6572,15 @@ impl<'a, C> EnterprisePolicyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6702,13 +6588,15 @@ impl<'a, C> EnterprisePolicyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6953,25 +6841,15 @@ impl<'a, C> EnterprisePolicyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6979,13 +6857,15 @@ impl<'a, C> EnterprisePolicyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7260,25 +7140,15 @@ impl<'a, C> EnterprisePolicyPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7286,13 +7156,15 @@ impl<'a, C> EnterprisePolicyPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7564,25 +7436,15 @@ impl<'a, C> EnterpriseWebAppCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7590,13 +7452,15 @@ impl<'a, C> EnterpriseWebAppCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7840,25 +7704,15 @@ impl<'a, C> EnterpriseWebAppDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7866,13 +7720,15 @@ impl<'a, C> EnterpriseWebAppDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8107,25 +7963,15 @@ impl<'a, C> EnterpriseWebAppGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8133,13 +7979,15 @@ impl<'a, C> EnterpriseWebAppGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8384,25 +8232,15 @@ impl<'a, C> EnterpriseWebAppListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8410,13 +8248,15 @@ impl<'a, C> EnterpriseWebAppListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8691,25 +8531,15 @@ impl<'a, C> EnterpriseWebAppPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8717,13 +8547,15 @@ impl<'a, C> EnterpriseWebAppPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8995,25 +8827,15 @@ impl<'a, C> EnterpriseWebTokenCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9021,13 +8843,15 @@ impl<'a, C> EnterpriseWebTokenCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9285,25 +9109,15 @@ impl<'a, C> EnterpriseCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9311,13 +9125,15 @@ impl<'a, C> EnterpriseCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9579,25 +9395,15 @@ impl<'a, C> EnterpriseDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9605,13 +9411,15 @@ impl<'a, C> EnterpriseDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9846,25 +9654,15 @@ impl<'a, C> EnterpriseGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9872,13 +9670,15 @@ impl<'a, C> EnterpriseGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10106,25 +9906,15 @@ impl<'a, C> EnterpriseListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10132,13 +9922,15 @@ impl<'a, C> EnterpriseListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10417,25 +10209,15 @@ impl<'a, C> EnterprisePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10443,13 +10225,15 @@ impl<'a, C> EnterprisePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10683,25 +10467,15 @@ impl<'a, C> SignupUrlCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10709,13 +10483,15 @@ impl<'a, C> SignupUrlCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/androidmanagement1/src/client.rs b/gen/androidmanagement1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/androidmanagement1/src/client.rs +++ b/gen/androidmanagement1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/androidpublisher2-cli/src/main.rs b/gen/androidpublisher2-cli/src/main.rs index fe197b63a8..bc62b8fb01 100644 --- a/gen/androidpublisher2-cli/src/main.rs +++ b/gen/androidpublisher2-cli/src/main.rs @@ -3510,7 +3510,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-index", "token", "max-results", "end-time", "start-time"].iter().map(|v|*v)); + v.extend(["end-time", "max-results", "start-index", "start-time", "token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/androidpublisher2/src/api.rs b/gen/androidpublisher2/src/api.rs index 89df602dc8..f629b39fa2 100644 --- a/gen/androidpublisher2/src/api.rs +++ b/gen/androidpublisher2/src/api.rs @@ -3009,25 +3009,15 @@ impl<'a, C> EditApklistingDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3035,11 +3025,11 @@ impl<'a, C> EditApklistingDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -3293,25 +3283,15 @@ impl<'a, C> EditApklistingDeleteallCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3319,11 +3299,11 @@ impl<'a, C> EditApklistingDeleteallCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -3570,25 +3550,15 @@ impl<'a, C> EditApklistingGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3596,13 +3566,15 @@ impl<'a, C> EditApklistingGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3863,25 +3835,15 @@ impl<'a, C> EditApklistingListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3889,13 +3851,15 @@ impl<'a, C> EditApklistingListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4169,25 +4133,15 @@ impl<'a, C> EditApklistingPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4195,13 +4149,15 @@ impl<'a, C> EditApklistingPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4494,25 +4450,15 @@ impl<'a, C> EditApklistingUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4520,13 +4466,15 @@ impl<'a, C> EditApklistingUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4815,25 +4763,15 @@ impl<'a, C> EditApkAddexternallyhostedCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4841,13 +4779,15 @@ impl<'a, C> EditApkAddexternallyhostedCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5093,25 +5033,15 @@ impl<'a, C> EditApkListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5119,13 +5049,15 @@ impl<'a, C> EditApkListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5402,25 +5334,15 @@ impl<'a, C> EditApkUploadCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5428,7 +5350,7 @@ impl<'a, C> EditApkUploadCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -5440,7 +5362,7 @@ impl<'a, C> EditApkUploadCall<'a, C> where C: BorrowMut EditApkUploadCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5742,25 +5666,15 @@ impl<'a, C> EditBundleListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5768,13 +5682,15 @@ impl<'a, C> EditBundleListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6058,25 +5974,15 @@ impl<'a, C> EditBundleUploadCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6084,7 +5990,7 @@ impl<'a, C> EditBundleUploadCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -6096,7 +6002,7 @@ impl<'a, C> EditBundleUploadCall<'a, C> where C: BorrowMut EditBundleUploadCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6451,25 +6359,15 @@ impl<'a, C> EditDeobfuscationfileUploadCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6477,7 +6375,7 @@ impl<'a, C> EditDeobfuscationfileUploadCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -6489,7 +6387,7 @@ impl<'a, C> EditDeobfuscationfileUploadCall<'a, C> where C: BorrowMut EditDeobfuscationfileUploadCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6812,25 +6712,15 @@ impl<'a, C> EditDetailGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6838,13 +6728,15 @@ impl<'a, C> EditDetailGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7104,25 +6996,15 @@ impl<'a, C> EditDetailPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7130,13 +7012,15 @@ impl<'a, C> EditDetailPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7405,25 +7289,15 @@ impl<'a, C> EditDetailUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7431,13 +7305,15 @@ impl<'a, C> EditDetailUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7689,25 +7565,15 @@ impl<'a, C> EditExpansionfileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7715,13 +7581,15 @@ impl<'a, C> EditExpansionfileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8004,25 +7872,15 @@ impl<'a, C> EditExpansionfilePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8030,13 +7888,15 @@ impl<'a, C> EditExpansionfilePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8328,25 +8188,15 @@ impl<'a, C> EditExpansionfileUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8354,13 +8204,15 @@ impl<'a, C> EditExpansionfileUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8671,25 +8523,15 @@ impl<'a, C> EditExpansionfileUploadCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8697,7 +8539,7 @@ impl<'a, C> EditExpansionfileUploadCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -8709,7 +8551,7 @@ impl<'a, C> EditExpansionfileUploadCall<'a, C> where C: BorrowMut EditExpansionfileUploadCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9037,25 +8881,15 @@ impl<'a, C> EditImageDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9063,11 +8897,11 @@ impl<'a, C> EditImageDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -9333,25 +9167,15 @@ impl<'a, C> EditImageDeleteallCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9359,13 +9183,15 @@ impl<'a, C> EditImageDeleteallCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9627,25 +9453,15 @@ impl<'a, C> EditImageListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9653,13 +9469,15 @@ impl<'a, C> EditImageListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9961,25 +9779,15 @@ impl<'a, C> EditImageUploadCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9987,7 +9795,7 @@ impl<'a, C> EditImageUploadCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -9999,7 +9807,7 @@ impl<'a, C> EditImageUploadCall<'a, C> where C: BorrowMut EditImageUploadCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10323,25 +10133,15 @@ impl<'a, C> EditListingDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10349,11 +10149,11 @@ impl<'a, C> EditListingDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -10595,25 +10395,15 @@ impl<'a, C> EditListingDeleteallCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10621,11 +10411,11 @@ impl<'a, C> EditListingDeleteallCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -10860,25 +10650,15 @@ impl<'a, C> EditListingGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10886,13 +10666,15 @@ impl<'a, C> EditListingGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11141,25 +10923,15 @@ impl<'a, C> EditListingListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11167,13 +10939,15 @@ impl<'a, C> EditListingListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11435,25 +11209,15 @@ impl<'a, C> EditListingPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11461,13 +11225,15 @@ impl<'a, C> EditListingPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11748,25 +11514,15 @@ impl<'a, C> EditListingUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11774,13 +11530,15 @@ impl<'a, C> EditListingUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12038,25 +11796,15 @@ impl<'a, C> EditTesterGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12064,13 +11812,15 @@ impl<'a, C> EditTesterGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12340,25 +12090,15 @@ impl<'a, C> EditTesterPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12366,13 +12106,15 @@ impl<'a, C> EditTesterPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12651,25 +12393,15 @@ impl<'a, C> EditTesterUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12677,13 +12409,15 @@ impl<'a, C> EditTesterUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12943,25 +12677,15 @@ impl<'a, C> EditTrackGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12969,13 +12693,15 @@ impl<'a, C> EditTrackGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13224,25 +12950,15 @@ impl<'a, C> EditTrackListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13250,13 +12966,15 @@ impl<'a, C> EditTrackListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13518,25 +13236,15 @@ impl<'a, C> EditTrackPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13544,13 +13252,15 @@ impl<'a, C> EditTrackPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13831,25 +13541,15 @@ impl<'a, C> EditTrackUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13857,13 +13557,15 @@ impl<'a, C> EditTrackUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14121,25 +13823,15 @@ impl<'a, C> EditCommitCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14147,13 +13839,15 @@ impl<'a, C> EditCommitCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14391,25 +14085,15 @@ impl<'a, C> EditDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14417,11 +14101,11 @@ impl<'a, C> EditDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -14654,25 +14338,15 @@ impl<'a, C> EditGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14680,13 +14354,15 @@ impl<'a, C> EditGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14944,25 +14620,15 @@ impl<'a, C> EditInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14970,13 +14636,15 @@ impl<'a, C> EditInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15214,25 +14882,15 @@ impl<'a, C> EditValidateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15240,13 +14898,15 @@ impl<'a, C> EditValidateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15484,25 +15144,15 @@ impl<'a, C> InappproductDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15510,11 +15160,11 @@ impl<'a, C> InappproductDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -15747,25 +15397,15 @@ impl<'a, C> InappproductGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15773,13 +15413,15 @@ impl<'a, C> InappproductGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16041,25 +15683,15 @@ impl<'a, C> InappproductInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16067,13 +15699,15 @@ impl<'a, C> InappproductInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16331,25 +15965,15 @@ impl<'a, C> InappproductListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16357,13 +15981,15 @@ impl<'a, C> InappproductListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16636,25 +16262,15 @@ impl<'a, C> InappproductPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16662,13 +16278,15 @@ impl<'a, C> InappproductPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16949,25 +16567,15 @@ impl<'a, C> InappproductUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16975,13 +16583,15 @@ impl<'a, C> InappproductUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17240,25 +16850,15 @@ impl<'a, C> OrderRefundCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17266,11 +16866,11 @@ impl<'a, C> OrderRefundCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -17512,25 +17112,15 @@ impl<'a, C> PurchaseProductGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17538,13 +17128,15 @@ impl<'a, C> PurchaseProductGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17794,25 +17386,15 @@ impl<'a, C> PurchaseSubscriptionCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17820,11 +17402,11 @@ impl<'a, C> PurchaseSubscriptionCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -18090,25 +17672,15 @@ impl<'a, C> PurchaseSubscriptionDeferCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18116,13 +17688,15 @@ impl<'a, C> PurchaseSubscriptionDeferCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18382,25 +17956,15 @@ impl<'a, C> PurchaseSubscriptionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18408,13 +17972,15 @@ impl<'a, C> PurchaseSubscriptionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18664,25 +18230,15 @@ impl<'a, C> PurchaseSubscriptionRefundCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18690,11 +18246,11 @@ impl<'a, C> PurchaseSubscriptionRefundCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -18938,25 +18494,15 @@ impl<'a, C> PurchaseSubscriptionRevokeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18964,11 +18510,11 @@ impl<'a, C> PurchaseSubscriptionRevokeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -19234,25 +18780,15 @@ impl<'a, C> PurchaseVoidedpurchaseListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19260,13 +18796,15 @@ impl<'a, C> PurchaseVoidedpurchaseListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19532,25 +19070,15 @@ impl<'a, C> ReviewGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19558,13 +19086,15 @@ impl<'a, C> ReviewGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19826,25 +19356,15 @@ impl<'a, C> ReviewListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19852,13 +19372,15 @@ impl<'a, C> ReviewListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20132,25 +19654,15 @@ impl<'a, C> ReviewReplyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20158,13 +19670,15 @@ impl<'a, C> ReviewReplyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/androidpublisher2/src/client.rs b/gen/androidpublisher2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/androidpublisher2/src/client.rs +++ b/gen/androidpublisher2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/androidpublisher3-cli/src/main.rs b/gen/androidpublisher3-cli/src/main.rs index c809a0a4c4..5fe11125df 100644 --- a/gen/androidpublisher3-cli/src/main.rs +++ b/gen/androidpublisher3-cli/src/main.rs @@ -2502,7 +2502,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["token", "start-index", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "start-index", "token"].iter().map(|v|*v)); v } )); } } @@ -3403,7 +3403,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["token", "type", "start-index", "max-results", "start-time", "end-time"].iter().map(|v|*v)); + v.extend(["end-time", "max-results", "start-index", "start-time", "token", "type"].iter().map(|v|*v)); v } )); } } @@ -3524,7 +3524,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["token", "start-index", "max-results", "translation-language"].iter().map(|v|*v)); + v.extend(["max-results", "start-index", "token", "translation-language"].iter().map(|v|*v)); v } )); } } diff --git a/gen/androidpublisher3/src/api.rs b/gen/androidpublisher3/src/api.rs index c8ca4a9cb4..61fd710211 100644 --- a/gen/androidpublisher3/src/api.rs +++ b/gen/androidpublisher3/src/api.rs @@ -3350,25 +3350,15 @@ impl<'a, C> EditApkAddexternallyhostedCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3376,13 +3366,15 @@ impl<'a, C> EditApkAddexternallyhostedCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3634,25 +3626,15 @@ impl<'a, C> EditApkListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3660,13 +3642,15 @@ impl<'a, C> EditApkListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3949,25 +3933,15 @@ impl<'a, C> EditApkUploadCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3975,7 +3949,7 @@ impl<'a, C> EditApkUploadCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -3987,7 +3961,7 @@ impl<'a, C> EditApkUploadCall<'a, C> where C: BorrowMut EditApkUploadCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4295,25 +4271,15 @@ impl<'a, C> EditBundleListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4321,13 +4287,15 @@ impl<'a, C> EditBundleListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4615,25 +4583,15 @@ impl<'a, C> EditBundleUploadCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4641,7 +4599,7 @@ impl<'a, C> EditBundleUploadCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -4653,7 +4611,7 @@ impl<'a, C> EditBundleUploadCall<'a, C> where C: BorrowMut EditBundleUploadCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5012,25 +4972,15 @@ impl<'a, C> EditDeobfuscationfileUploadCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5038,7 +4988,7 @@ impl<'a, C> EditDeobfuscationfileUploadCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -5050,7 +5000,7 @@ impl<'a, C> EditDeobfuscationfileUploadCall<'a, C> where C: BorrowMut EditDeobfuscationfileUploadCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5378,25 +5330,15 @@ impl<'a, C> EditDetailGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5404,13 +5346,15 @@ impl<'a, C> EditDetailGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5674,25 +5618,15 @@ impl<'a, C> EditDetailPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5700,13 +5634,15 @@ impl<'a, C> EditDetailPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5979,25 +5915,15 @@ impl<'a, C> EditDetailUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6005,13 +5931,15 @@ impl<'a, C> EditDetailUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6267,25 +6195,15 @@ impl<'a, C> EditExpansionfileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6293,13 +6211,15 @@ impl<'a, C> EditExpansionfileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6587,25 +6507,15 @@ impl<'a, C> EditExpansionfilePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6613,13 +6523,15 @@ impl<'a, C> EditExpansionfilePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6916,25 +6828,15 @@ impl<'a, C> EditExpansionfileUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6942,13 +6844,15 @@ impl<'a, C> EditExpansionfileUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7264,25 +7168,15 @@ impl<'a, C> EditExpansionfileUploadCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7290,7 +7184,7 @@ impl<'a, C> EditExpansionfileUploadCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -7302,7 +7196,7 @@ impl<'a, C> EditExpansionfileUploadCall<'a, C> where C: BorrowMut EditExpansionfileUploadCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7635,25 +7531,15 @@ impl<'a, C> EditImageDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7661,11 +7547,11 @@ impl<'a, C> EditImageDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -7936,25 +7822,15 @@ impl<'a, C> EditImageDeleteallCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7962,13 +7838,15 @@ impl<'a, C> EditImageDeleteallCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8235,25 +8113,15 @@ impl<'a, C> EditImageListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8261,13 +8129,15 @@ impl<'a, C> EditImageListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8574,25 +8444,15 @@ impl<'a, C> EditImageUploadCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8600,7 +8460,7 @@ impl<'a, C> EditImageUploadCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -8612,7 +8472,7 @@ impl<'a, C> EditImageUploadCall<'a, C> where C: BorrowMut EditImageUploadCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8941,25 +8803,15 @@ impl<'a, C> EditListingDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8967,11 +8819,11 @@ impl<'a, C> EditListingDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -9217,25 +9069,15 @@ impl<'a, C> EditListingDeleteallCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9243,11 +9085,11 @@ impl<'a, C> EditListingDeleteallCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -9486,25 +9328,15 @@ impl<'a, C> EditListingGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9512,13 +9344,15 @@ impl<'a, C> EditListingGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9771,25 +9605,15 @@ impl<'a, C> EditListingListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9797,13 +9621,15 @@ impl<'a, C> EditListingListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10069,25 +9895,15 @@ impl<'a, C> EditListingPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10095,13 +9911,15 @@ impl<'a, C> EditListingPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10386,25 +10204,15 @@ impl<'a, C> EditListingUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10412,13 +10220,15 @@ impl<'a, C> EditListingUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10682,25 +10492,15 @@ impl<'a, C> EditTesterGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10708,13 +10508,15 @@ impl<'a, C> EditTesterGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10990,25 +10792,15 @@ impl<'a, C> EditTesterPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11016,13 +10808,15 @@ impl<'a, C> EditTesterPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11307,25 +11101,15 @@ impl<'a, C> EditTesterUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11333,13 +11117,15 @@ impl<'a, C> EditTesterUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11603,25 +11389,15 @@ impl<'a, C> EditTrackGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11629,13 +11405,15 @@ impl<'a, C> EditTrackGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11888,25 +11666,15 @@ impl<'a, C> EditTrackListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11914,13 +11682,15 @@ impl<'a, C> EditTrackListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12186,25 +11956,15 @@ impl<'a, C> EditTrackPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12212,13 +11972,15 @@ impl<'a, C> EditTrackPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12503,25 +12265,15 @@ impl<'a, C> EditTrackUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12529,13 +12281,15 @@ impl<'a, C> EditTrackUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12797,25 +12551,15 @@ impl<'a, C> EditCommitCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12823,13 +12567,15 @@ impl<'a, C> EditCommitCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13071,25 +12817,15 @@ impl<'a, C> EditDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13097,11 +12833,11 @@ impl<'a, C> EditDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -13338,25 +13074,15 @@ impl<'a, C> EditGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13364,13 +13090,15 @@ impl<'a, C> EditGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13632,25 +13360,15 @@ impl<'a, C> EditInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13658,13 +13376,15 @@ impl<'a, C> EditInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13906,25 +13626,15 @@ impl<'a, C> EditValidateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13932,13 +13642,15 @@ impl<'a, C> EditValidateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14180,25 +13892,15 @@ impl<'a, C> InappproductDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14206,11 +13908,11 @@ impl<'a, C> InappproductDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -14447,25 +14149,15 @@ impl<'a, C> InappproductGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14473,13 +14165,15 @@ impl<'a, C> InappproductGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14746,25 +14440,15 @@ impl<'a, C> InappproductInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14772,13 +14456,15 @@ impl<'a, C> InappproductInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15040,25 +14726,15 @@ impl<'a, C> InappproductListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15066,13 +14742,15 @@ impl<'a, C> InappproductListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15352,25 +15030,15 @@ impl<'a, C> InappproductPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15378,13 +15046,15 @@ impl<'a, C> InappproductPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15669,25 +15339,15 @@ impl<'a, C> InappproductUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15695,13 +15355,15 @@ impl<'a, C> InappproductUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15998,25 +15660,15 @@ impl<'a, C> InternalappsharingartifactUploadapkCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16024,7 +15676,7 @@ impl<'a, C> InternalappsharingartifactUploadapkCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -16036,7 +15688,7 @@ impl<'a, C> InternalappsharingartifactUploadapkCall<'a, C> where C: BorrowMut InternalappsharingartifactUploadapkCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16372,25 +16026,15 @@ impl<'a, C> InternalappsharingartifactUploadbundleCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16398,7 +16042,7 @@ impl<'a, C> InternalappsharingartifactUploadbundleCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -16410,7 +16054,7 @@ impl<'a, C> InternalappsharingartifactUploadbundleCall<'a, C> where C: BorrowMut } let mut client = &mut *self.hub.client.borrow_mut(); let upload_result = { - let url_str = &reconstructed_result.headers().get("Location").expect("LOCATION header is part of protocol").to_str().unwrap(); + let url_str = &res.headers().get("Location").expect("LOCATION header is part of protocol").to_str().unwrap(); if upload_url_from_server { dlg.store_upload_url(Some(url_str)); } @@ -16448,8 +16092,10 @@ impl<'a, C> InternalappsharingartifactUploadbundleCall<'a, C> where C: BorrowMut } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16712,25 +16358,15 @@ impl<'a, C> OrderRefundCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16738,11 +16374,11 @@ impl<'a, C> OrderRefundCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -17008,25 +16644,15 @@ impl<'a, C> PurchaseProductAcknowledgeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17034,11 +16660,11 @@ impl<'a, C> PurchaseProductAcknowledgeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -17296,25 +16922,15 @@ impl<'a, C> PurchaseProductGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17322,13 +16938,15 @@ impl<'a, C> PurchaseProductGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17603,25 +17221,15 @@ impl<'a, C> PurchaseSubscriptionAcknowledgeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17629,11 +17237,11 @@ impl<'a, C> PurchaseSubscriptionAcknowledgeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -17890,25 +17498,15 @@ impl<'a, C> PurchaseSubscriptionCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17916,11 +17514,11 @@ impl<'a, C> PurchaseSubscriptionCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -18190,25 +17788,15 @@ impl<'a, C> PurchaseSubscriptionDeferCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18216,13 +17804,15 @@ impl<'a, C> PurchaseSubscriptionDeferCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18486,25 +18076,15 @@ impl<'a, C> PurchaseSubscriptionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18512,13 +18092,15 @@ impl<'a, C> PurchaseSubscriptionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18772,25 +18354,15 @@ impl<'a, C> PurchaseSubscriptionRefundCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18798,11 +18370,11 @@ impl<'a, C> PurchaseSubscriptionRefundCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -19050,25 +18622,15 @@ impl<'a, C> PurchaseSubscriptionRevokeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19076,11 +18638,11 @@ impl<'a, C> PurchaseSubscriptionRevokeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -19355,25 +18917,15 @@ impl<'a, C> PurchaseVoidedpurchaseListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19381,13 +18933,15 @@ impl<'a, C> PurchaseVoidedpurchaseListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19667,25 +19221,15 @@ impl<'a, C> ReviewGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19693,13 +19237,15 @@ impl<'a, C> ReviewGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19967,25 +19513,15 @@ impl<'a, C> ReviewListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19993,13 +19529,15 @@ impl<'a, C> ReviewListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20281,25 +19819,15 @@ impl<'a, C> ReviewReplyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20307,13 +19835,15 @@ impl<'a, C> ReviewReplyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20586,25 +20116,15 @@ impl<'a, C> SystemapkVariantCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20612,13 +20132,15 @@ impl<'a, C> SystemapkVariantCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20874,25 +20396,15 @@ impl<'a, C> SystemapkVariantDownloadCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20900,11 +20412,11 @@ impl<'a, C> SystemapkVariantDownloadCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -21153,25 +20665,15 @@ impl<'a, C> SystemapkVariantGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21179,13 +20681,15 @@ impl<'a, C> SystemapkVariantGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21438,25 +20942,15 @@ impl<'a, C> SystemapkVariantListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21464,13 +20958,15 @@ impl<'a, C> SystemapkVariantListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/androidpublisher3/src/client.rs b/gen/androidpublisher3/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/androidpublisher3/src/client.rs +++ b/gen/androidpublisher3/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/apigateway1-cli/src/main.rs b/gen/apigateway1-cli/src/main.rs index b76d25ad6f..5abc71aea9 100644 --- a/gen/apigateway1-cli/src/main.rs +++ b/gen/apigateway1-cli/src/main.rs @@ -333,7 +333,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "order-by", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -921,7 +921,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "order-by", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1509,7 +1509,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "order-by", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1891,7 +1891,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2141,7 +2141,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/apigateway1/src/api.rs b/gen/apigateway1/src/api.rs index 679185ff8f..b383ba5c93 100644 --- a/gen/apigateway1/src/api.rs +++ b/gen/apigateway1/src/api.rs @@ -1510,25 +1510,15 @@ impl<'a, C> ProjectLocationApiConfigCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1536,13 +1526,15 @@ impl<'a, C> ProjectLocationApiConfigCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1793,25 +1785,15 @@ impl<'a, C> ProjectLocationApiConfigDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1819,13 +1801,15 @@ impl<'a, C> ProjectLocationApiConfigDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2065,25 +2049,15 @@ impl<'a, C> ProjectLocationApiConfigGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2091,13 +2065,15 @@ impl<'a, C> ProjectLocationApiConfigGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2344,25 +2320,15 @@ impl<'a, C> ProjectLocationApiConfigGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2370,13 +2336,15 @@ impl<'a, C> ProjectLocationApiConfigGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2638,25 +2606,15 @@ impl<'a, C> ProjectLocationApiConfigListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2664,13 +2622,15 @@ impl<'a, C> ProjectLocationApiConfigListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2959,25 +2919,15 @@ impl<'a, C> ProjectLocationApiConfigPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2985,13 +2935,15 @@ impl<'a, C> ProjectLocationApiConfigPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3263,25 +3215,15 @@ impl<'a, C> ProjectLocationApiConfigSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3289,13 +3231,15 @@ impl<'a, C> ProjectLocationApiConfigSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3560,25 +3504,15 @@ impl<'a, C> ProjectLocationApiConfigTestIamPermissionCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3586,13 +3520,15 @@ impl<'a, C> ProjectLocationApiConfigTestIamPermissionCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3862,25 +3798,15 @@ impl<'a, C> ProjectLocationApiCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3888,13 +3814,15 @@ impl<'a, C> ProjectLocationApiCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4145,25 +4073,15 @@ impl<'a, C> ProjectLocationApiDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4171,13 +4089,15 @@ impl<'a, C> ProjectLocationApiDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4412,25 +4332,15 @@ impl<'a, C> ProjectLocationApiGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4438,13 +4348,15 @@ impl<'a, C> ProjectLocationApiGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4684,25 +4596,15 @@ impl<'a, C> ProjectLocationApiGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4710,13 +4612,15 @@ impl<'a, C> ProjectLocationApiGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4978,25 +4882,15 @@ impl<'a, C> ProjectLocationApiListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5004,13 +4898,15 @@ impl<'a, C> ProjectLocationApiListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5299,25 +5195,15 @@ impl<'a, C> ProjectLocationApiPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5325,13 +5211,15 @@ impl<'a, C> ProjectLocationApiPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5603,25 +5491,15 @@ impl<'a, C> ProjectLocationApiSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5629,13 +5507,15 @@ impl<'a, C> ProjectLocationApiSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5900,25 +5780,15 @@ impl<'a, C> ProjectLocationApiTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5926,13 +5796,15 @@ impl<'a, C> ProjectLocationApiTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6202,25 +6074,15 @@ impl<'a, C> ProjectLocationGatewayCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6228,13 +6090,15 @@ impl<'a, C> ProjectLocationGatewayCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6485,25 +6349,15 @@ impl<'a, C> ProjectLocationGatewayDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6511,13 +6365,15 @@ impl<'a, C> ProjectLocationGatewayDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6752,25 +6608,15 @@ impl<'a, C> ProjectLocationGatewayGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6778,13 +6624,15 @@ impl<'a, C> ProjectLocationGatewayGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7024,25 +6872,15 @@ impl<'a, C> ProjectLocationGatewayGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7050,13 +6888,15 @@ impl<'a, C> ProjectLocationGatewayGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7318,25 +7158,15 @@ impl<'a, C> ProjectLocationGatewayListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7344,13 +7174,15 @@ impl<'a, C> ProjectLocationGatewayListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7639,25 +7471,15 @@ impl<'a, C> ProjectLocationGatewayPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7665,13 +7487,15 @@ impl<'a, C> ProjectLocationGatewayPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7943,25 +7767,15 @@ impl<'a, C> ProjectLocationGatewaySetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7969,13 +7783,15 @@ impl<'a, C> ProjectLocationGatewaySetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8240,25 +8056,15 @@ impl<'a, C> ProjectLocationGatewayTestIamPermissionCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8266,13 +8072,15 @@ impl<'a, C> ProjectLocationGatewayTestIamPermissionCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8537,25 +8345,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8563,13 +8361,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8813,25 +8613,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8839,13 +8629,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9080,25 +8872,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9106,13 +8888,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9362,25 +9146,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9388,13 +9162,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9650,25 +9426,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9676,13 +9442,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9932,25 +9700,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9958,13 +9716,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/apigateway1/src/client.rs b/gen/apigateway1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/apigateway1/src/client.rs +++ b/gen/apigateway1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/apigee1-cli/src/main.rs b/gen/apigee1-cli/src/main.rs index d5170ca3e2..71d6d0e164 100644 --- a/gen/apigee1-cli/src/main.rs +++ b/gen/apigee1-cli/src/main.rs @@ -1102,7 +1102,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["attributevalue", "count", "start-key", "attributename", "expand"].iter().map(|v|*v)); + v.extend(["attributename", "attributevalue", "count", "expand", "start-key"].iter().map(|v|*v)); v } )); } } @@ -1650,7 +1650,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["include-revisions", "include-meta-data"].iter().map(|v|*v)); + v.extend(["include-meta-data", "include-revisions"].iter().map(|v|*v)); v } )); } } @@ -2032,7 +2032,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["include-cred", "apptype", "api-product", "start-key", "expand", "status", "key-status", "rows", "ids"].iter().map(|v|*v)); + v.extend(["api-product", "apptype", "expand", "ids", "include-cred", "key-status", "rows", "start-key", "status"].iter().map(|v|*v)); v } )); } } @@ -2395,7 +2395,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3872,7 +3872,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["shallow-expand", "count", "start-key", "expand"].iter().map(|v|*v)); + v.extend(["count", "expand", "shallow-expand", "start-key"].iter().map(|v|*v)); v } )); } } @@ -4569,7 +4569,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["count", "start-key", "expand", "app", "include-company", "ids"].iter().map(|v|*v)); + v.extend(["app", "count", "expand", "ids", "include-company", "start-key"].iter().map(|v|*v)); v } )); } } @@ -4972,7 +4972,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -5228,7 +5228,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -5380,7 +5380,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["type", "disable-cache"].iter().map(|v|*v)); + v.extend(["disable-cache", "type"].iter().map(|v|*v)); v } )); } } @@ -5936,7 +5936,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -7023,7 +7023,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["ignore-newline-validation", "format", "alias", "ignore-expiry-validation", "-password"].iter().map(|v|*v)); + v.extend(["-password", "alias", "format", "ignore-expiry-validation", "ignore-newline-validation"].iter().map(|v|*v)); v } )); } } @@ -7324,7 +7324,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["ignore-newline-validation", "ignore-expiry-validation"].iter().map(|v|*v)); + v.extend(["ignore-expiry-validation", "ignore-newline-validation"].iter().map(|v|*v)); v } )); } } @@ -7754,7 +7754,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "topk", "select", "limit", "accuracy", "time-unit", "sortby", "sort", "sonar", "agg-table", "offset", "time-range", "tzo", "ts-ascending", "realtime"].iter().map(|v|*v)); + v.extend(["accuracy", "agg-table", "filter", "limit", "offset", "realtime", "select", "sonar", "sort", "sortby", "time-range", "time-unit", "topk", "ts-ascending", "tzo"].iter().map(|v|*v)); v } )); } } @@ -8022,7 +8022,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["to", "incl-queries-without-report", "status", "from", "submitted-by", "dataset"].iter().map(|v|*v)); + v.extend(["dataset", "from", "incl-queries-without-report", "status", "submitted-by", "to"].iter().map(|v|*v)); v } )); } } @@ -8395,7 +8395,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["type", "name"].iter().map(|v|*v)); + v.extend(["name", "type"].iter().map(|v|*v)); v } )); } } @@ -9090,7 +9090,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "topk", "select", "limit", "accuracy", "time-unit", "sortby", "sort", "sonar", "agg-table", "offset", "time-range", "tzo", "ts-ascending", "realtime"].iter().map(|v|*v)); + v.extend(["accuracy", "agg-table", "filter", "limit", "offset", "realtime", "select", "sonar", "sort", "sortby", "time-range", "time-unit", "topk", "ts-ascending", "tzo"].iter().map(|v|*v)); v } )); } } @@ -9784,7 +9784,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -10848,7 +10848,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["envgroup-hostname", "to", "incl-queries-without-report", "status", "from", "submitted-by", "dataset"].iter().map(|v|*v)); + v.extend(["dataset", "envgroup-hostname", "from", "incl-queries-without-report", "status", "submitted-by", "to"].iter().map(|v|*v)); v } )); } } @@ -10943,7 +10943,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "topk", "select", "limit", "envgroup-hostname", "accuracy", "time-unit", "sortby", "sort", "offset", "time-range", "tzo", "ts-ascending", "realtime"].iter().map(|v|*v)); + v.extend(["accuracy", "envgroup-hostname", "filter", "limit", "offset", "realtime", "select", "sort", "sortby", "time-range", "time-unit", "topk", "ts-ascending", "tzo"].iter().map(|v|*v)); v } )); } } @@ -11193,7 +11193,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -11598,7 +11598,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -11932,7 +11932,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -12322,7 +12322,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -12417,7 +12417,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "topk", "select", "limit", "envgroup-hostname", "accuracy", "time-unit", "sortby", "sort", "offset", "time-range", "tzo", "ts-ascending", "realtime"].iter().map(|v|*v)); + v.extend(["accuracy", "envgroup-hostname", "filter", "limit", "offset", "realtime", "select", "sort", "sortby", "time-range", "time-unit", "topk", "ts-ascending", "tzo"].iter().map(|v|*v)); v } )); } } @@ -13179,7 +13179,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["include-revisions", "include-meta-data"].iter().map(|v|*v)); + v.extend(["include-meta-data", "include-revisions"].iter().map(|v|*v)); v } )); } } diff --git a/gen/apigee1/src/api.rs b/gen/apigee1/src/api.rs index 7eb26dd931..7cd3ebd0ba 100644 --- a/gen/apigee1/src/api.rs +++ b/gen/apigee1/src/api.rs @@ -8393,25 +8393,15 @@ impl<'a, C> HybridIssuerListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8419,13 +8409,15 @@ impl<'a, C> HybridIssuerListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8681,25 +8673,15 @@ impl<'a, C> OrganizationAnalyticDatastoreCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8707,13 +8689,15 @@ impl<'a, C> OrganizationAnalyticDatastoreCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8957,25 +8941,15 @@ impl<'a, C> OrganizationAnalyticDatastoreDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8983,13 +8957,15 @@ impl<'a, C> OrganizationAnalyticDatastoreDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9224,25 +9200,15 @@ impl<'a, C> OrganizationAnalyticDatastoreGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9250,13 +9216,15 @@ impl<'a, C> OrganizationAnalyticDatastoreGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9496,25 +9464,15 @@ impl<'a, C> OrganizationAnalyticDatastoreListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9522,13 +9480,15 @@ impl<'a, C> OrganizationAnalyticDatastoreListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9791,25 +9751,15 @@ impl<'a, C> OrganizationAnalyticDatastoreTestCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9817,13 +9767,15 @@ impl<'a, C> OrganizationAnalyticDatastoreTestCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10088,25 +10040,15 @@ impl<'a, C> OrganizationAnalyticDatastoreUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10114,13 +10056,15 @@ impl<'a, C> OrganizationAnalyticDatastoreUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10364,25 +10308,15 @@ impl<'a, C> OrganizationApiproductAttributeDeleteCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10390,13 +10324,15 @@ impl<'a, C> OrganizationApiproductAttributeDeleteCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10631,25 +10567,15 @@ impl<'a, C> OrganizationApiproductAttributeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10657,13 +10583,15 @@ impl<'a, C> OrganizationApiproductAttributeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10898,25 +10826,15 @@ impl<'a, C> OrganizationApiproductAttributeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10924,13 +10842,15 @@ impl<'a, C> OrganizationApiproductAttributeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11186,25 +11106,15 @@ impl<'a, C> OrganizationApiproductAttributeUpdateApiProductAttributeCall<'a, C> return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11212,13 +11122,15 @@ impl<'a, C> OrganizationApiproductAttributeUpdateApiProductAttributeCall<'a, C> } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11483,25 +11395,15 @@ impl<'a, C> OrganizationApiproductAttributeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11509,13 +11411,15 @@ impl<'a, C> OrganizationApiproductAttributeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11780,25 +11684,15 @@ impl<'a, C> OrganizationApiproductCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11806,13 +11700,15 @@ impl<'a, C> OrganizationApiproductCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12056,25 +11952,15 @@ impl<'a, C> OrganizationApiproductDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12082,13 +11968,15 @@ impl<'a, C> OrganizationApiproductDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12323,25 +12211,15 @@ impl<'a, C> OrganizationApiproductGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12349,13 +12227,15 @@ impl<'a, C> OrganizationApiproductGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12615,25 +12495,15 @@ impl<'a, C> OrganizationApiproductListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12641,13 +12511,15 @@ impl<'a, C> OrganizationApiproductListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12938,25 +12810,15 @@ impl<'a, C> OrganizationApiproductUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12964,13 +12826,15 @@ impl<'a, C> OrganizationApiproductUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13214,25 +13078,15 @@ impl<'a, C> OrganizationApiDeploymentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13240,13 +13094,15 @@ impl<'a, C> OrganizationApiDeploymentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13502,25 +13358,15 @@ impl<'a, C> OrganizationApiKeyvaluemapCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13528,13 +13374,15 @@ impl<'a, C> OrganizationApiKeyvaluemapCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13778,25 +13626,15 @@ impl<'a, C> OrganizationApiKeyvaluemapDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13804,13 +13642,15 @@ impl<'a, C> OrganizationApiKeyvaluemapDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14045,25 +13885,15 @@ impl<'a, C> OrganizationApiRevisionDeploymentListCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14071,13 +13901,15 @@ impl<'a, C> OrganizationApiRevisionDeploymentListCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14312,25 +14144,15 @@ impl<'a, C> OrganizationApiRevisionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14338,13 +14160,15 @@ impl<'a, C> OrganizationApiRevisionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14584,25 +14408,15 @@ impl<'a, C> OrganizationApiRevisionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14610,13 +14424,15 @@ impl<'a, C> OrganizationApiRevisionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14884,25 +14700,15 @@ impl<'a, C> OrganizationApiRevisionUpdateApiProxyRevisionCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14910,13 +14716,15 @@ impl<'a, C> OrganizationApiRevisionUpdateApiProxyRevisionCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15203,25 +15011,15 @@ impl<'a, C> OrganizationApiCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15229,13 +15027,15 @@ impl<'a, C> OrganizationApiCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15500,25 +15300,15 @@ impl<'a, C> OrganizationApiDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15526,13 +15316,15 @@ impl<'a, C> OrganizationApiDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15767,25 +15559,15 @@ impl<'a, C> OrganizationApiGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15793,13 +15575,15 @@ impl<'a, C> OrganizationApiGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16044,25 +15828,15 @@ impl<'a, C> OrganizationApiListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16070,13 +15844,15 @@ impl<'a, C> OrganizationApiListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16325,25 +16101,15 @@ impl<'a, C> OrganizationAppGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16351,13 +16117,15 @@ impl<'a, C> OrganizationAppGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16637,25 +16405,15 @@ impl<'a, C> OrganizationAppListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16663,13 +16421,15 @@ impl<'a, C> OrganizationAppListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16993,25 +16753,15 @@ impl<'a, C> OrganizationDatacollectorCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17019,13 +16769,15 @@ impl<'a, C> OrganizationDatacollectorCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17276,25 +17028,15 @@ impl<'a, C> OrganizationDatacollectorDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17302,13 +17044,15 @@ impl<'a, C> OrganizationDatacollectorDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17543,25 +17287,15 @@ impl<'a, C> OrganizationDatacollectorGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17569,13 +17303,15 @@ impl<'a, C> OrganizationDatacollectorGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17820,25 +17556,15 @@ impl<'a, C> OrganizationDatacollectorListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17846,13 +17572,15 @@ impl<'a, C> OrganizationDatacollectorListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18127,25 +17855,15 @@ impl<'a, C> OrganizationDatacollectorPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18153,13 +17871,15 @@ impl<'a, C> OrganizationDatacollectorPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18415,25 +18135,15 @@ impl<'a, C> OrganizationDeploymentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18441,13 +18151,15 @@ impl<'a, C> OrganizationDeploymentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18689,25 +18401,15 @@ impl<'a, C> OrganizationDeveloperAppAttributeDeleteCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18715,13 +18417,15 @@ impl<'a, C> OrganizationDeveloperAppAttributeDeleteCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18956,25 +18660,15 @@ impl<'a, C> OrganizationDeveloperAppAttributeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18982,13 +18676,15 @@ impl<'a, C> OrganizationDeveloperAppAttributeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19223,25 +18919,15 @@ impl<'a, C> OrganizationDeveloperAppAttributeListCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19249,13 +18935,15 @@ impl<'a, C> OrganizationDeveloperAppAttributeListCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19511,25 +19199,15 @@ impl<'a, C> OrganizationDeveloperAppAttributeUpdateDeveloperAppAttributeCall<'a, return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19537,13 +19215,15 @@ impl<'a, C> OrganizationDeveloperAppAttributeUpdateDeveloperAppAttributeCall<'a, } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19787,25 +19467,15 @@ impl<'a, C> OrganizationDeveloperAppKeyApiproductDeleteCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19813,13 +19483,15 @@ impl<'a, C> OrganizationDeveloperAppKeyApiproductDeleteCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20059,25 +19731,15 @@ impl<'a, C> OrganizationDeveloperAppKeyApiproductUpdateDeveloperAppKeyApiProduct return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20085,13 +19747,15 @@ impl<'a, C> OrganizationDeveloperAppKeyApiproductUpdateDeveloperAppKeyApiProduct } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20354,25 +20018,15 @@ impl<'a, C> OrganizationDeveloperAppKeyCreateCreateCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20380,13 +20034,15 @@ impl<'a, C> OrganizationDeveloperAppKeyCreateCreateCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20651,25 +20307,15 @@ impl<'a, C> OrganizationDeveloperAppKeyCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20677,13 +20323,15 @@ impl<'a, C> OrganizationDeveloperAppKeyCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20927,25 +20575,15 @@ impl<'a, C> OrganizationDeveloperAppKeyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20953,13 +20591,15 @@ impl<'a, C> OrganizationDeveloperAppKeyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21194,25 +20834,15 @@ impl<'a, C> OrganizationDeveloperAppKeyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21220,13 +20850,15 @@ impl<'a, C> OrganizationDeveloperAppKeyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21482,25 +21114,15 @@ impl<'a, C> OrganizationDeveloperAppKeyReplaceDeveloperAppKeyCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21508,13 +21130,15 @@ impl<'a, C> OrganizationDeveloperAppKeyReplaceDeveloperAppKeyCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21784,25 +21408,15 @@ impl<'a, C> OrganizationDeveloperAppKeyUpdateDeveloperAppKeyCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21810,13 +21424,15 @@ impl<'a, C> OrganizationDeveloperAppKeyUpdateDeveloperAppKeyCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22088,25 +21704,15 @@ impl<'a, C> OrganizationDeveloperAppAttributeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22114,13 +21720,15 @@ impl<'a, C> OrganizationDeveloperAppAttributeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22385,25 +21993,15 @@ impl<'a, C> OrganizationDeveloperAppCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22411,13 +22009,15 @@ impl<'a, C> OrganizationDeveloperAppCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22661,25 +22261,15 @@ impl<'a, C> OrganizationDeveloperAppDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22687,13 +22277,15 @@ impl<'a, C> OrganizationDeveloperAppDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22954,25 +22546,15 @@ impl<'a, C> OrganizationDeveloperAppGenerateKeyPairOrUpdateDeveloperAppStatuCall return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22980,13 +22562,15 @@ impl<'a, C> OrganizationDeveloperAppGenerateKeyPairOrUpdateDeveloperAppStatuCall } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23247,25 +22831,15 @@ impl<'a, C> OrganizationDeveloperAppGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23273,13 +22847,15 @@ impl<'a, C> OrganizationDeveloperAppGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23548,25 +23124,15 @@ impl<'a, C> OrganizationDeveloperAppListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23574,13 +23140,15 @@ impl<'a, C> OrganizationDeveloperAppListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23864,25 +23432,15 @@ impl<'a, C> OrganizationDeveloperAppUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23890,13 +23448,15 @@ impl<'a, C> OrganizationDeveloperAppUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24140,25 +23700,15 @@ impl<'a, C> OrganizationDeveloperAttributeDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24166,13 +23716,15 @@ impl<'a, C> OrganizationDeveloperAttributeDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24407,25 +23959,15 @@ impl<'a, C> OrganizationDeveloperAttributeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24433,13 +23975,15 @@ impl<'a, C> OrganizationDeveloperAttributeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24674,25 +24218,15 @@ impl<'a, C> OrganizationDeveloperAttributeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24700,13 +24234,15 @@ impl<'a, C> OrganizationDeveloperAttributeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24962,25 +24498,15 @@ impl<'a, C> OrganizationDeveloperAttributeUpdateDeveloperAttributeCall<'a, C> wh return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24988,13 +24514,15 @@ impl<'a, C> OrganizationDeveloperAttributeUpdateDeveloperAttributeCall<'a, C> wh } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25259,25 +24787,15 @@ impl<'a, C> OrganizationDeveloperAttributeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25285,13 +24803,15 @@ impl<'a, C> OrganizationDeveloperAttributeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25556,25 +25076,15 @@ impl<'a, C> OrganizationDeveloperCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25582,13 +25092,15 @@ impl<'a, C> OrganizationDeveloperCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25832,25 +25344,15 @@ impl<'a, C> OrganizationDeveloperDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25858,13 +25360,15 @@ impl<'a, C> OrganizationDeveloperDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26104,25 +25608,15 @@ impl<'a, C> OrganizationDeveloperGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26130,13 +25624,15 @@ impl<'a, C> OrganizationDeveloperGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26408,25 +25904,15 @@ impl<'a, C> OrganizationDeveloperListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26434,13 +25920,15 @@ impl<'a, C> OrganizationDeveloperListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26722,25 +26210,15 @@ impl<'a, C> OrganizationDeveloperSetDeveloperStatuCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26748,13 +26226,15 @@ impl<'a, C> OrganizationDeveloperSetDeveloperStatuCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27017,25 +26497,15 @@ impl<'a, C> OrganizationDeveloperUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27043,13 +26513,15 @@ impl<'a, C> OrganizationDeveloperUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27314,25 +26786,15 @@ impl<'a, C> OrganizationEnvgroupAttachmentCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27340,13 +26802,15 @@ impl<'a, C> OrganizationEnvgroupAttachmentCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27590,25 +27054,15 @@ impl<'a, C> OrganizationEnvgroupAttachmentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27616,13 +27070,15 @@ impl<'a, C> OrganizationEnvgroupAttachmentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27857,25 +27313,15 @@ impl<'a, C> OrganizationEnvgroupAttachmentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27883,13 +27329,15 @@ impl<'a, C> OrganizationEnvgroupAttachmentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28134,25 +27582,15 @@ impl<'a, C> OrganizationEnvgroupAttachmentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28160,13 +27598,15 @@ impl<'a, C> OrganizationEnvgroupAttachmentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28441,25 +27881,15 @@ impl<'a, C> OrganizationEnvgroupCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28467,13 +27897,15 @@ impl<'a, C> OrganizationEnvgroupCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28724,25 +28156,15 @@ impl<'a, C> OrganizationEnvgroupDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28750,13 +28172,15 @@ impl<'a, C> OrganizationEnvgroupDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28991,25 +28415,15 @@ impl<'a, C> OrganizationEnvgroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29017,13 +28431,15 @@ impl<'a, C> OrganizationEnvgroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29268,25 +28684,15 @@ impl<'a, C> OrganizationEnvgroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29294,13 +28700,15 @@ impl<'a, C> OrganizationEnvgroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29575,25 +28983,15 @@ impl<'a, C> OrganizationEnvgroupPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29601,13 +28999,15 @@ impl<'a, C> OrganizationEnvgroupPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29868,25 +29268,15 @@ impl<'a, C> OrganizationEnvironmentAnalyticAdminGetSchemav2Call<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29894,13 +29284,15 @@ impl<'a, C> OrganizationEnvironmentAnalyticAdminGetSchemav2Call<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30170,25 +29562,15 @@ impl<'a, C> OrganizationEnvironmentAnalyticExportCreateCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30196,13 +29578,15 @@ impl<'a, C> OrganizationEnvironmentAnalyticExportCreateCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30446,25 +29830,15 @@ impl<'a, C> OrganizationEnvironmentAnalyticExportGetCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30472,13 +29846,15 @@ impl<'a, C> OrganizationEnvironmentAnalyticExportGetCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30713,25 +30089,15 @@ impl<'a, C> OrganizationEnvironmentAnalyticExportListCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30739,13 +30105,15 @@ impl<'a, C> OrganizationEnvironmentAnalyticExportListCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30980,25 +30348,15 @@ impl<'a, C> OrganizationEnvironmentApiDeploymentListCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31006,13 +30364,15 @@ impl<'a, C> OrganizationEnvironmentApiDeploymentListCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31247,25 +30607,15 @@ impl<'a, C> OrganizationEnvironmentApiRevisionDebugsessionDataGetCall<'a, C> whe return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31273,13 +30623,15 @@ impl<'a, C> OrganizationEnvironmentApiRevisionDebugsessionDataGetCall<'a, C> whe } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31540,25 +30892,15 @@ impl<'a, C> OrganizationEnvironmentApiRevisionDebugsessionCreateCall<'a, C> wher return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31566,13 +30908,15 @@ impl<'a, C> OrganizationEnvironmentApiRevisionDebugsessionCreateCall<'a, C> wher } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31823,25 +31167,15 @@ impl<'a, C> OrganizationEnvironmentApiRevisionDebugsessionDeleteDataCall<'a, C> return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31849,13 +31183,15 @@ impl<'a, C> OrganizationEnvironmentApiRevisionDebugsessionDeleteDataCall<'a, C> } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32090,25 +31426,15 @@ impl<'a, C> OrganizationEnvironmentApiRevisionDebugsessionGetCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32116,13 +31442,15 @@ impl<'a, C> OrganizationEnvironmentApiRevisionDebugsessionGetCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32367,25 +31695,15 @@ impl<'a, C> OrganizationEnvironmentApiRevisionDebugsessionListCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32393,13 +31711,15 @@ impl<'a, C> OrganizationEnvironmentApiRevisionDebugsessionListCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32653,25 +31973,15 @@ impl<'a, C> OrganizationEnvironmentApiRevisionDeploymentGenerateDeployChangeRepo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32679,13 +31989,15 @@ impl<'a, C> OrganizationEnvironmentApiRevisionDeploymentGenerateDeployChangeRepo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32927,25 +32239,15 @@ impl<'a, C> OrganizationEnvironmentApiRevisionDeploymentGenerateUndeployChangeRe return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32953,13 +32255,15 @@ impl<'a, C> OrganizationEnvironmentApiRevisionDeploymentGenerateUndeployChangeRe } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33204,25 +32508,15 @@ impl<'a, C> OrganizationEnvironmentApiRevisionDeployCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33230,13 +32524,15 @@ impl<'a, C> OrganizationEnvironmentApiRevisionDeployCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33485,25 +32781,15 @@ impl<'a, C> OrganizationEnvironmentApiRevisionGetDeploymentCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33511,13 +32797,15 @@ impl<'a, C> OrganizationEnvironmentApiRevisionGetDeploymentCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33757,25 +33045,15 @@ impl<'a, C> OrganizationEnvironmentApiRevisionUndeployCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33783,13 +33061,15 @@ impl<'a, C> OrganizationEnvironmentApiRevisionUndeployCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34031,25 +33311,15 @@ impl<'a, C> OrganizationEnvironmentCacheDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34057,13 +33327,15 @@ impl<'a, C> OrganizationEnvironmentCacheDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34303,25 +33575,15 @@ impl<'a, C> OrganizationEnvironmentDeploymentListCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34329,13 +33591,15 @@ impl<'a, C> OrganizationEnvironmentDeploymentListCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34598,25 +33862,15 @@ impl<'a, C> OrganizationEnvironmentFlowhookAttachSharedFlowToFlowHookCall<'a, C> return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34624,13 +33878,15 @@ impl<'a, C> OrganizationEnvironmentFlowhookAttachSharedFlowToFlowHookCall<'a, C> } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34874,25 +34130,15 @@ impl<'a, C> OrganizationEnvironmentFlowhookDetachSharedFlowFromFlowHookCall<'a, return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34900,13 +34146,15 @@ impl<'a, C> OrganizationEnvironmentFlowhookDetachSharedFlowFromFlowHookCall<'a, } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35141,25 +34389,15 @@ impl<'a, C> OrganizationEnvironmentFlowhookGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35167,13 +34405,15 @@ impl<'a, C> OrganizationEnvironmentFlowhookGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35454,25 +34694,15 @@ impl<'a, C> OrganizationEnvironmentKeystoreAliaseCreateCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35480,13 +34710,15 @@ impl<'a, C> OrganizationEnvironmentKeystoreAliaseCreateCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35765,25 +34997,15 @@ impl<'a, C> OrganizationEnvironmentKeystoreAliaseCsrCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35791,13 +35013,15 @@ impl<'a, C> OrganizationEnvironmentKeystoreAliaseCsrCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36032,25 +35256,15 @@ impl<'a, C> OrganizationEnvironmentKeystoreAliaseDeleteCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36058,13 +35272,15 @@ impl<'a, C> OrganizationEnvironmentKeystoreAliaseDeleteCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36299,25 +35515,15 @@ impl<'a, C> OrganizationEnvironmentKeystoreAliaseGetCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36325,13 +35531,15 @@ impl<'a, C> OrganizationEnvironmentKeystoreAliaseGetCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36566,25 +35774,15 @@ impl<'a, C> OrganizationEnvironmentKeystoreAliaseGetCertificateCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36592,13 +35790,15 @@ impl<'a, C> OrganizationEnvironmentKeystoreAliaseGetCertificateCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36864,25 +36064,15 @@ impl<'a, C> OrganizationEnvironmentKeystoreAliaseUpdateCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36890,13 +36080,15 @@ impl<'a, C> OrganizationEnvironmentKeystoreAliaseUpdateCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37180,25 +36372,15 @@ impl<'a, C> OrganizationEnvironmentKeystoreCreateCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37206,13 +36388,15 @@ impl<'a, C> OrganizationEnvironmentKeystoreCreateCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37463,25 +36647,15 @@ impl<'a, C> OrganizationEnvironmentKeystoreDeleteCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37489,13 +36663,15 @@ impl<'a, C> OrganizationEnvironmentKeystoreDeleteCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37730,25 +36906,15 @@ impl<'a, C> OrganizationEnvironmentKeystoreGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37756,13 +36922,15 @@ impl<'a, C> OrganizationEnvironmentKeystoreGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38018,25 +37186,15 @@ impl<'a, C> OrganizationEnvironmentKeyvaluemapCreateCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38044,13 +37202,15 @@ impl<'a, C> OrganizationEnvironmentKeyvaluemapCreateCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38294,25 +37454,15 @@ impl<'a, C> OrganizationEnvironmentKeyvaluemapDeleteCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38320,13 +37470,15 @@ impl<'a, C> OrganizationEnvironmentKeyvaluemapDeleteCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38636,25 +37788,15 @@ impl<'a, C> OrganizationEnvironmentOptimizedStatGetCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38662,13 +37804,15 @@ impl<'a, C> OrganizationEnvironmentOptimizedStatGetCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39029,25 +38173,15 @@ impl<'a, C> OrganizationEnvironmentQueryCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39055,13 +38189,15 @@ impl<'a, C> OrganizationEnvironmentQueryCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39305,25 +38441,15 @@ impl<'a, C> OrganizationEnvironmentQueryGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39331,13 +38457,15 @@ impl<'a, C> OrganizationEnvironmentQueryGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39572,25 +38700,15 @@ impl<'a, C> OrganizationEnvironmentQueryGetResultCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39598,13 +38716,15 @@ impl<'a, C> OrganizationEnvironmentQueryGetResultCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39869,25 +38989,15 @@ impl<'a, C> OrganizationEnvironmentQueryListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39895,13 +39005,15 @@ impl<'a, C> OrganizationEnvironmentQueryListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40199,25 +39311,15 @@ impl<'a, C> OrganizationEnvironmentReferenceCreateCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40225,13 +39327,15 @@ impl<'a, C> OrganizationEnvironmentReferenceCreateCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40475,25 +39579,15 @@ impl<'a, C> OrganizationEnvironmentReferenceDeleteCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40501,13 +39595,15 @@ impl<'a, C> OrganizationEnvironmentReferenceDeleteCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40742,25 +39838,15 @@ impl<'a, C> OrganizationEnvironmentReferenceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40768,13 +39854,15 @@ impl<'a, C> OrganizationEnvironmentReferenceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41030,25 +40118,15 @@ impl<'a, C> OrganizationEnvironmentReferenceUpdateCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41056,13 +40134,15 @@ impl<'a, C> OrganizationEnvironmentReferenceUpdateCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41337,25 +40417,15 @@ impl<'a, C> OrganizationEnvironmentResourcefileCreateCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41363,13 +40433,15 @@ impl<'a, C> OrganizationEnvironmentResourcefileCreateCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41631,25 +40703,15 @@ impl<'a, C> OrganizationEnvironmentResourcefileDeleteCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41657,13 +40719,15 @@ impl<'a, C> OrganizationEnvironmentResourcefileDeleteCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41922,25 +40986,15 @@ impl<'a, C> OrganizationEnvironmentResourcefileGetCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41948,13 +41002,15 @@ impl<'a, C> OrganizationEnvironmentResourcefileGetCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42214,25 +41270,15 @@ impl<'a, C> OrganizationEnvironmentResourcefileListCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42240,13 +41286,15 @@ impl<'a, C> OrganizationEnvironmentResourcefileListCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42490,25 +41538,15 @@ impl<'a, C> OrganizationEnvironmentResourcefileListEnvironmentResourceCall<'a, C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42516,13 +41554,15 @@ impl<'a, C> OrganizationEnvironmentResourcefileListEnvironmentResourceCall<'a, C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42792,25 +41832,15 @@ impl<'a, C> OrganizationEnvironmentResourcefileUpdateCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42818,13 +41848,15 @@ impl<'a, C> OrganizationEnvironmentResourcefileUpdateCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43088,25 +42120,15 @@ impl<'a, C> OrganizationEnvironmentSharedflowDeploymentListCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43114,13 +42136,15 @@ impl<'a, C> OrganizationEnvironmentSharedflowDeploymentListCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43360,25 +42384,15 @@ impl<'a, C> OrganizationEnvironmentSharedflowRevisionDeployCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43386,13 +42400,15 @@ impl<'a, C> OrganizationEnvironmentSharedflowRevisionDeployCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43634,25 +42650,15 @@ impl<'a, C> OrganizationEnvironmentSharedflowRevisionGetDeploymentCall<'a, C> wh return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43660,13 +42666,15 @@ impl<'a, C> OrganizationEnvironmentSharedflowRevisionGetDeploymentCall<'a, C> wh } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43901,25 +42909,15 @@ impl<'a, C> OrganizationEnvironmentSharedflowRevisionUndeployCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43927,13 +42925,15 @@ impl<'a, C> OrganizationEnvironmentSharedflowRevisionUndeployCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44243,25 +43243,15 @@ impl<'a, C> OrganizationEnvironmentStatGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44269,13 +43259,15 @@ impl<'a, C> OrganizationEnvironmentStatGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44641,25 +43633,15 @@ impl<'a, C> OrganizationEnvironmentTargetserverCreateCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44667,13 +43649,15 @@ impl<'a, C> OrganizationEnvironmentTargetserverCreateCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44924,25 +43908,15 @@ impl<'a, C> OrganizationEnvironmentTargetserverDeleteCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44950,13 +43924,15 @@ impl<'a, C> OrganizationEnvironmentTargetserverDeleteCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45191,25 +44167,15 @@ impl<'a, C> OrganizationEnvironmentTargetserverGetCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45217,13 +44183,15 @@ impl<'a, C> OrganizationEnvironmentTargetserverGetCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45479,25 +44447,15 @@ impl<'a, C> OrganizationEnvironmentTargetserverUpdateCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45505,13 +44463,15 @@ impl<'a, C> OrganizationEnvironmentTargetserverUpdateCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45776,25 +44736,15 @@ impl<'a, C> OrganizationEnvironmentTraceConfigOverrideCreateCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45802,13 +44752,15 @@ impl<'a, C> OrganizationEnvironmentTraceConfigOverrideCreateCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46052,25 +45004,15 @@ impl<'a, C> OrganizationEnvironmentTraceConfigOverrideDeleteCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46078,13 +45020,15 @@ impl<'a, C> OrganizationEnvironmentTraceConfigOverrideDeleteCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46319,25 +45263,15 @@ impl<'a, C> OrganizationEnvironmentTraceConfigOverrideGetCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46345,13 +45279,15 @@ impl<'a, C> OrganizationEnvironmentTraceConfigOverrideGetCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46596,25 +45532,15 @@ impl<'a, C> OrganizationEnvironmentTraceConfigOverrideListCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46622,13 +45548,15 @@ impl<'a, C> OrganizationEnvironmentTraceConfigOverrideListCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46903,25 +45831,15 @@ impl<'a, C> OrganizationEnvironmentTraceConfigOverridePatchCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46929,13 +45847,15 @@ impl<'a, C> OrganizationEnvironmentTraceConfigOverridePatchCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47212,25 +46132,15 @@ impl<'a, C> OrganizationEnvironmentCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47238,13 +46148,15 @@ impl<'a, C> OrganizationEnvironmentCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47495,25 +46407,15 @@ impl<'a, C> OrganizationEnvironmentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47521,13 +46423,15 @@ impl<'a, C> OrganizationEnvironmentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47762,25 +46666,15 @@ impl<'a, C> OrganizationEnvironmentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47788,13 +46682,15 @@ impl<'a, C> OrganizationEnvironmentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -48029,25 +46925,15 @@ impl<'a, C> OrganizationEnvironmentGetDebugmaskCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -48055,13 +46941,15 @@ impl<'a, C> OrganizationEnvironmentGetDebugmaskCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -48296,25 +47184,15 @@ impl<'a, C> OrganizationEnvironmentGetDeployedConfigCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -48322,13 +47200,15 @@ impl<'a, C> OrganizationEnvironmentGetDeployedConfigCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -48568,25 +47448,15 @@ impl<'a, C> OrganizationEnvironmentGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -48594,13 +47464,15 @@ impl<'a, C> OrganizationEnvironmentGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -48842,25 +47714,15 @@ impl<'a, C> OrganizationEnvironmentGetTraceConfigCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -48868,13 +47730,15 @@ impl<'a, C> OrganizationEnvironmentGetTraceConfigCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49130,25 +47994,15 @@ impl<'a, C> OrganizationEnvironmentSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -49156,13 +48010,15 @@ impl<'a, C> OrganizationEnvironmentSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49406,25 +48262,15 @@ impl<'a, C> OrganizationEnvironmentSubscribeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -49432,13 +48278,15 @@ impl<'a, C> OrganizationEnvironmentSubscribeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49694,25 +48542,15 @@ impl<'a, C> OrganizationEnvironmentTestIamPermissionCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -49720,13 +48558,15 @@ impl<'a, C> OrganizationEnvironmentTestIamPermissionCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49991,25 +48831,15 @@ impl<'a, C> OrganizationEnvironmentUnsubscribeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -50017,13 +48847,15 @@ impl<'a, C> OrganizationEnvironmentUnsubscribeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -50288,25 +49120,15 @@ impl<'a, C> OrganizationEnvironmentUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -50314,13 +49136,15 @@ impl<'a, C> OrganizationEnvironmentUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -50595,25 +49419,15 @@ impl<'a, C> OrganizationEnvironmentUpdateDebugmaskCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -50621,13 +49435,15 @@ impl<'a, C> OrganizationEnvironmentUpdateDebugmaskCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -50906,25 +49722,15 @@ impl<'a, C> OrganizationEnvironmentUpdateEnvironmentCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -50932,13 +49738,15 @@ impl<'a, C> OrganizationEnvironmentUpdateEnvironmentCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51208,25 +50016,15 @@ impl<'a, C> OrganizationEnvironmentUpdateTraceConfigCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51234,13 +50032,15 @@ impl<'a, C> OrganizationEnvironmentUpdateTraceConfigCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51512,25 +50312,15 @@ impl<'a, C> OrganizationHostQueryCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51538,13 +50328,15 @@ impl<'a, C> OrganizationHostQueryCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51788,25 +50580,15 @@ impl<'a, C> OrganizationHostQueryGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51814,13 +50596,15 @@ impl<'a, C> OrganizationHostQueryGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -52055,25 +50839,15 @@ impl<'a, C> OrganizationHostQueryGetResultCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -52081,13 +50855,15 @@ impl<'a, C> OrganizationHostQueryGetResultCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -52322,25 +51098,15 @@ impl<'a, C> OrganizationHostQueryGetResultViewCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -52348,13 +51114,15 @@ impl<'a, C> OrganizationHostQueryGetResultViewCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -52624,25 +51392,15 @@ impl<'a, C> OrganizationHostQueryListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -52650,13 +51408,15 @@ impl<'a, C> OrganizationHostQueryListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -53010,25 +51770,15 @@ impl<'a, C> OrganizationHostStatGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -53036,13 +51786,15 @@ impl<'a, C> OrganizationHostStatGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -53396,25 +52148,15 @@ impl<'a, C> OrganizationInstanceAttachmentCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -53422,13 +52164,15 @@ impl<'a, C> OrganizationInstanceAttachmentCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -53672,25 +52416,15 @@ impl<'a, C> OrganizationInstanceAttachmentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -53698,13 +52432,15 @@ impl<'a, C> OrganizationInstanceAttachmentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -53939,25 +52675,15 @@ impl<'a, C> OrganizationInstanceAttachmentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -53965,13 +52691,15 @@ impl<'a, C> OrganizationInstanceAttachmentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -54216,25 +52944,15 @@ impl<'a, C> OrganizationInstanceAttachmentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -54242,13 +52960,15 @@ impl<'a, C> OrganizationInstanceAttachmentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -54518,25 +53238,15 @@ impl<'a, C> OrganizationInstanceCanaryevaluationCreateCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -54544,13 +53254,15 @@ impl<'a, C> OrganizationInstanceCanaryevaluationCreateCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -54794,25 +53506,15 @@ impl<'a, C> OrganizationInstanceCanaryevaluationGetCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -54820,13 +53522,15 @@ impl<'a, C> OrganizationInstanceCanaryevaluationGetCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -55082,25 +53786,15 @@ impl<'a, C> OrganizationInstanceNatAddresseActivateCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -55108,13 +53802,15 @@ impl<'a, C> OrganizationInstanceNatAddresseActivateCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -55379,25 +54075,15 @@ impl<'a, C> OrganizationInstanceNatAddresseCreateCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -55405,13 +54091,15 @@ impl<'a, C> OrganizationInstanceNatAddresseCreateCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -55655,25 +54343,15 @@ impl<'a, C> OrganizationInstanceNatAddresseDeleteCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -55681,13 +54359,15 @@ impl<'a, C> OrganizationInstanceNatAddresseDeleteCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -55922,25 +54602,15 @@ impl<'a, C> OrganizationInstanceNatAddresseGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -55948,13 +54618,15 @@ impl<'a, C> OrganizationInstanceNatAddresseGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -56199,25 +54871,15 @@ impl<'a, C> OrganizationInstanceNatAddresseListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -56225,13 +54887,15 @@ impl<'a, C> OrganizationInstanceNatAddresseListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -56501,25 +55165,15 @@ impl<'a, C> OrganizationInstanceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -56527,13 +55181,15 @@ impl<'a, C> OrganizationInstanceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -56777,25 +55433,15 @@ impl<'a, C> OrganizationInstanceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -56803,13 +55449,15 @@ impl<'a, C> OrganizationInstanceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -57044,25 +55692,15 @@ impl<'a, C> OrganizationInstanceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -57070,13 +55708,15 @@ impl<'a, C> OrganizationInstanceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -57321,25 +55961,15 @@ impl<'a, C> OrganizationInstanceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -57347,13 +55977,15 @@ impl<'a, C> OrganizationInstanceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -57623,25 +56255,15 @@ impl<'a, C> OrganizationInstanceReportStatuCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -57649,13 +56271,15 @@ impl<'a, C> OrganizationInstanceReportStatuCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -57920,25 +56544,15 @@ impl<'a, C> OrganizationKeyvaluemapCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -57946,13 +56560,15 @@ impl<'a, C> OrganizationKeyvaluemapCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -58196,25 +56812,15 @@ impl<'a, C> OrganizationKeyvaluemapDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -58222,13 +56828,15 @@ impl<'a, C> OrganizationKeyvaluemapDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -58463,25 +57071,15 @@ impl<'a, C> OrganizationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -58489,13 +57087,15 @@ impl<'a, C> OrganizationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -58745,25 +57345,15 @@ impl<'a, C> OrganizationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -58771,13 +57361,15 @@ impl<'a, C> OrganizationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -59103,25 +57695,15 @@ impl<'a, C> OrganizationOptimizedHostStatGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -59129,13 +57711,15 @@ impl<'a, C> OrganizationOptimizedHostStatGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -59489,25 +58073,15 @@ impl<'a, C> OrganizationReportCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -59515,13 +58089,15 @@ impl<'a, C> OrganizationReportCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -59765,25 +58341,15 @@ impl<'a, C> OrganizationReportDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -59791,13 +58357,15 @@ impl<'a, C> OrganizationReportDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -60032,25 +58600,15 @@ impl<'a, C> OrganizationReportGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -60058,13 +58616,15 @@ impl<'a, C> OrganizationReportGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -60304,25 +58864,15 @@ impl<'a, C> OrganizationReportListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -60330,13 +58880,15 @@ impl<'a, C> OrganizationReportListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -60599,25 +59151,15 @@ impl<'a, C> OrganizationReportUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -60625,13 +59167,15 @@ impl<'a, C> OrganizationReportUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -60875,25 +59419,15 @@ impl<'a, C> OrganizationSharedflowDeploymentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -60901,13 +59435,15 @@ impl<'a, C> OrganizationSharedflowDeploymentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -61142,25 +59678,15 @@ impl<'a, C> OrganizationSharedflowRevisionDeploymentListCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -61168,13 +59694,15 @@ impl<'a, C> OrganizationSharedflowRevisionDeploymentListCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -61409,25 +59937,15 @@ impl<'a, C> OrganizationSharedflowRevisionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -61435,13 +59953,15 @@ impl<'a, C> OrganizationSharedflowRevisionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -61681,25 +60201,15 @@ impl<'a, C> OrganizationSharedflowRevisionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -61707,13 +60217,15 @@ impl<'a, C> OrganizationSharedflowRevisionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -61981,25 +60493,15 @@ impl<'a, C> OrganizationSharedflowRevisionUpdateSharedFlowRevisionCall<'a, C> wh return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -62007,13 +60509,15 @@ impl<'a, C> OrganizationSharedflowRevisionUpdateSharedFlowRevisionCall<'a, C> wh } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -62295,25 +60799,15 @@ impl<'a, C> OrganizationSharedflowCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -62321,13 +60815,15 @@ impl<'a, C> OrganizationSharedflowCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -62585,25 +61081,15 @@ impl<'a, C> OrganizationSharedflowDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -62611,13 +61097,15 @@ impl<'a, C> OrganizationSharedflowDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -62852,25 +61340,15 @@ impl<'a, C> OrganizationSharedflowGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -62878,13 +61356,15 @@ impl<'a, C> OrganizationSharedflowGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -63129,25 +61609,15 @@ impl<'a, C> OrganizationSharedflowListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -63155,13 +61625,15 @@ impl<'a, C> OrganizationSharedflowListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -63431,25 +61903,15 @@ impl<'a, C> OrganizationSiteApicategoryCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -63457,13 +61919,15 @@ impl<'a, C> OrganizationSiteApicategoryCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -63707,25 +62171,15 @@ impl<'a, C> OrganizationSiteApicategoryDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -63733,13 +62187,15 @@ impl<'a, C> OrganizationSiteApicategoryDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -63974,25 +62430,15 @@ impl<'a, C> OrganizationSiteApicategoryGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -64000,13 +62446,15 @@ impl<'a, C> OrganizationSiteApicategoryGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -64241,25 +62689,15 @@ impl<'a, C> OrganizationSiteApicategoryListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -64267,13 +62705,15 @@ impl<'a, C> OrganizationSiteApicategoryListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -64529,25 +62969,15 @@ impl<'a, C> OrganizationSiteApicategoryPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -64555,13 +62985,15 @@ impl<'a, C> OrganizationSiteApicategoryPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -64804,25 +63236,15 @@ impl<'a, C> OrganizationCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -64830,13 +63252,15 @@ impl<'a, C> OrganizationCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -65077,25 +63501,15 @@ impl<'a, C> OrganizationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -65103,13 +63517,15 @@ impl<'a, C> OrganizationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -65344,25 +63760,15 @@ impl<'a, C> OrganizationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -65370,13 +63776,15 @@ impl<'a, C> OrganizationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -65616,25 +64024,15 @@ impl<'a, C> OrganizationGetDeployedIngressConfigCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -65642,13 +64040,15 @@ impl<'a, C> OrganizationGetDeployedIngressConfigCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -65911,25 +64311,15 @@ impl<'a, C> OrganizationGetSyncAuthorizationCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -65937,13 +64327,15 @@ impl<'a, C> OrganizationGetSyncAuthorizationCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -66187,25 +64579,15 @@ impl<'a, C> OrganizationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -66213,13 +64595,15 @@ impl<'a, C> OrganizationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -66475,25 +64859,15 @@ impl<'a, C> OrganizationSetSyncAuthorizationCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -66501,13 +64875,15 @@ impl<'a, C> OrganizationSetSyncAuthorizationCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -66772,25 +65148,15 @@ impl<'a, C> OrganizationUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -66798,13 +65164,15 @@ impl<'a, C> OrganizationUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -67069,25 +65437,15 @@ impl<'a, C> ProjectProvisionOrganizationCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -67095,13 +65453,15 @@ impl<'a, C> ProjectProvisionOrganizationCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/apigee1/src/client.rs b/gen/apigee1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/apigee1/src/client.rs +++ b/gen/apigee1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/appengine1-cli/src/main.rs b/gen/appengine1-cli/src/main.rs index 0b50987c67..94a5286ad2 100644 --- a/gen/appengine1-cli/src/main.rs +++ b/gen/appengine1-cli/src/main.rs @@ -1477,7 +1477,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1591,7 +1591,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2039,7 +2039,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["update-mask", "migrate-traffic"].iter().map(|v|*v)); + v.extend(["migrate-traffic", "update-mask"].iter().map(|v|*v)); v } )); } } diff --git a/gen/appengine1/src/api.rs b/gen/appengine1/src/api.rs index 51194bae00..b871c00296 100644 --- a/gen/appengine1/src/api.rs +++ b/gen/appengine1/src/api.rs @@ -2685,25 +2685,15 @@ impl<'a, C> AppAuthorizedCertificateCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2711,13 +2701,15 @@ impl<'a, C> AppAuthorizedCertificateCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2959,25 +2951,15 @@ impl<'a, C> AppAuthorizedCertificateDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2985,13 +2967,15 @@ impl<'a, C> AppAuthorizedCertificateDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3239,25 +3223,15 @@ impl<'a, C> AppAuthorizedCertificateGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3265,13 +3239,15 @@ impl<'a, C> AppAuthorizedCertificateGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3534,25 +3510,15 @@ impl<'a, C> AppAuthorizedCertificateListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3560,13 +3526,15 @@ impl<'a, C> AppAuthorizedCertificateListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3846,25 +3814,15 @@ impl<'a, C> AppAuthorizedCertificatePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3872,13 +3830,15 @@ impl<'a, C> AppAuthorizedCertificatePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4145,25 +4105,15 @@ impl<'a, C> AppAuthorizedDomainListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4171,13 +4121,15 @@ impl<'a, C> AppAuthorizedDomainListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4448,25 +4400,15 @@ impl<'a, C> AppDomainMappingCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4474,13 +4416,15 @@ impl<'a, C> AppDomainMappingCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4729,25 +4673,15 @@ impl<'a, C> AppDomainMappingDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4755,13 +4689,15 @@ impl<'a, C> AppDomainMappingDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5004,25 +4940,15 @@ impl<'a, C> AppDomainMappingGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5030,13 +4956,15 @@ impl<'a, C> AppDomainMappingGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5287,25 +5215,15 @@ impl<'a, C> AppDomainMappingListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5313,13 +5231,15 @@ impl<'a, C> AppDomainMappingListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5592,25 +5512,15 @@ impl<'a, C> AppDomainMappingPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5618,13 +5528,15 @@ impl<'a, C> AppDomainMappingPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5902,25 +5814,15 @@ impl<'a, C> AppFirewallIngressRuleBatchUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5928,13 +5830,15 @@ impl<'a, C> AppFirewallIngressRuleBatchUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6195,25 +6099,15 @@ impl<'a, C> AppFirewallIngressRuleCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6221,13 +6115,15 @@ impl<'a, C> AppFirewallIngressRuleCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6469,25 +6365,15 @@ impl<'a, C> AppFirewallIngressRuleDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6495,13 +6381,15 @@ impl<'a, C> AppFirewallIngressRuleDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6744,25 +6632,15 @@ impl<'a, C> AppFirewallIngressRuleGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6770,13 +6648,15 @@ impl<'a, C> AppFirewallIngressRuleGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7032,25 +6912,15 @@ impl<'a, C> AppFirewallIngressRuleListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7058,13 +6928,15 @@ impl<'a, C> AppFirewallIngressRuleListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7344,25 +7216,15 @@ impl<'a, C> AppFirewallIngressRulePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7370,13 +7232,15 @@ impl<'a, C> AppFirewallIngressRulePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7635,25 +7499,15 @@ impl<'a, C> AppLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7661,13 +7515,15 @@ impl<'a, C> AppLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7923,25 +7779,15 @@ impl<'a, C> AppLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7949,13 +7795,15 @@ impl<'a, C> AppLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8209,25 +8057,15 @@ impl<'a, C> AppOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8235,13 +8073,15 @@ impl<'a, C> AppOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8497,25 +8337,15 @@ impl<'a, C> AppOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8523,13 +8353,15 @@ impl<'a, C> AppOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8808,25 +8640,15 @@ impl<'a, C> AppServiceVersionInstanceDebugCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8834,13 +8656,15 @@ impl<'a, C> AppServiceVersionInstanceDebugCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9116,25 +8940,15 @@ impl<'a, C> AppServiceVersionInstanceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9142,13 +8956,15 @@ impl<'a, C> AppServiceVersionInstanceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9415,25 +9231,15 @@ impl<'a, C> AppServiceVersionInstanceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9441,13 +9247,15 @@ impl<'a, C> AppServiceVersionInstanceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9722,25 +9530,15 @@ impl<'a, C> AppServiceVersionInstanceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9748,13 +9546,15 @@ impl<'a, C> AppServiceVersionInstanceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10042,25 +9842,15 @@ impl<'a, C> AppServiceVersionCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10068,13 +9858,15 @@ impl<'a, C> AppServiceVersionCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10328,25 +10120,15 @@ impl<'a, C> AppServiceVersionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10354,13 +10136,15 @@ impl<'a, C> AppServiceVersionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10620,25 +10404,15 @@ impl<'a, C> AppServiceVersionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10646,13 +10420,15 @@ impl<'a, C> AppServiceVersionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10927,25 +10703,15 @@ impl<'a, C> AppServiceVersionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10953,13 +10719,15 @@ impl<'a, C> AppServiceVersionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11251,25 +11019,15 @@ impl<'a, C> AppServiceVersionPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11277,13 +11035,15 @@ impl<'a, C> AppServiceVersionPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11552,25 +11312,15 @@ impl<'a, C> AppServiceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11578,13 +11328,15 @@ impl<'a, C> AppServiceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11827,25 +11579,15 @@ impl<'a, C> AppServiceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11853,13 +11595,15 @@ impl<'a, C> AppServiceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12110,25 +11854,15 @@ impl<'a, C> AppServiceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12136,13 +11870,15 @@ impl<'a, C> AppServiceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12420,25 +12156,15 @@ impl<'a, C> AppServicePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12446,13 +12172,15 @@ impl<'a, C> AppServicePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12714,25 +12442,15 @@ impl<'a, C> AppCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12740,13 +12458,15 @@ impl<'a, C> AppCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12976,25 +12696,15 @@ impl<'a, C> AppGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13002,13 +12712,15 @@ impl<'a, C> AppGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13265,25 +12977,15 @@ impl<'a, C> AppPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13291,13 +12993,15 @@ impl<'a, C> AppPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13565,25 +13269,15 @@ impl<'a, C> AppRepairCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13591,13 +13285,15 @@ impl<'a, C> AppRepairCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/appengine1/src/client.rs b/gen/appengine1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/appengine1/src/client.rs +++ b/gen/appengine1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/appengine1_beta4-cli/src/main.rs b/gen/appengine1_beta4-cli/src/main.rs index e6e5e61508..6ae9cbd2ac 100644 --- a/gen/appengine1_beta4-cli/src/main.rs +++ b/gen/appengine1_beta4-cli/src/main.rs @@ -274,7 +274,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -437,7 +437,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1034,7 +1034,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1096,7 +1096,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "view", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "view"].iter().map(|v|*v)); v } )); } } @@ -1360,7 +1360,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/appengine1_beta4/src/api.rs b/gen/appengine1_beta4/src/api.rs index b56a6ce59c..ecb36e4350 100644 --- a/gen/appengine1_beta4/src/api.rs +++ b/gen/appengine1_beta4/src/api.rs @@ -1796,25 +1796,15 @@ impl<'a, C> AppLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1822,13 +1812,15 @@ impl<'a, C> AppLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2084,25 +2076,15 @@ impl<'a, C> AppLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2110,13 +2092,15 @@ impl<'a, C> AppLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2395,25 +2379,15 @@ impl<'a, C> AppModuleVersionInstanceDebugCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2421,13 +2395,15 @@ impl<'a, C> AppModuleVersionInstanceDebugCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2703,25 +2679,15 @@ impl<'a, C> AppModuleVersionInstanceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2729,13 +2695,15 @@ impl<'a, C> AppModuleVersionInstanceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3002,25 +2970,15 @@ impl<'a, C> AppModuleVersionInstanceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3028,13 +2986,15 @@ impl<'a, C> AppModuleVersionInstanceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3309,25 +3269,15 @@ impl<'a, C> AppModuleVersionInstanceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3335,13 +3285,15 @@ impl<'a, C> AppModuleVersionInstanceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3629,25 +3581,15 @@ impl<'a, C> AppModuleVersionCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3655,13 +3597,15 @@ impl<'a, C> AppModuleVersionCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3915,25 +3859,15 @@ impl<'a, C> AppModuleVersionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3941,13 +3875,15 @@ impl<'a, C> AppModuleVersionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4207,25 +4143,15 @@ impl<'a, C> AppModuleVersionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4233,13 +4159,15 @@ impl<'a, C> AppModuleVersionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4514,25 +4442,15 @@ impl<'a, C> AppModuleVersionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4540,13 +4458,15 @@ impl<'a, C> AppModuleVersionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4842,25 +4762,15 @@ impl<'a, C> AppModuleVersionPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4868,13 +4778,15 @@ impl<'a, C> AppModuleVersionPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5143,25 +5055,15 @@ impl<'a, C> AppModuleDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5169,13 +5071,15 @@ impl<'a, C> AppModuleDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5418,25 +5322,15 @@ impl<'a, C> AppModuleGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5444,13 +5338,15 @@ impl<'a, C> AppModuleGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5701,25 +5597,15 @@ impl<'a, C> AppModuleListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5727,13 +5613,15 @@ impl<'a, C> AppModuleListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6011,25 +5899,15 @@ impl<'a, C> AppModulePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6037,13 +5915,15 @@ impl<'a, C> AppModulePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6309,25 +6189,15 @@ impl<'a, C> AppOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6335,13 +6205,15 @@ impl<'a, C> AppOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6597,25 +6469,15 @@ impl<'a, C> AppOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6623,13 +6485,15 @@ impl<'a, C> AppOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6881,25 +6745,15 @@ impl<'a, C> AppCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6907,13 +6761,15 @@ impl<'a, C> AppCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7148,25 +7004,15 @@ impl<'a, C> AppGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7174,13 +7020,15 @@ impl<'a, C> AppGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7446,25 +7294,15 @@ impl<'a, C> AppPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7472,13 +7310,15 @@ impl<'a, C> AppPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/appengine1_beta4/src/client.rs b/gen/appengine1_beta4/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/appengine1_beta4/src/client.rs +++ b/gen/appengine1_beta4/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/appengine1_beta5-cli/src/main.rs b/gen/appengine1_beta5-cli/src/main.rs index 7d0cc4842c..fb8c3f6485 100644 --- a/gen/appengine1_beta5-cli/src/main.rs +++ b/gen/appengine1_beta5-cli/src/main.rs @@ -274,7 +274,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -388,7 +388,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1312,7 +1312,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["view", "page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "view"].iter().map(|v|*v)); v } )); } } diff --git a/gen/appengine1_beta5/src/api.rs b/gen/appengine1_beta5/src/api.rs index 72b50a6dc3..51e541ac46 100644 --- a/gen/appengine1_beta5/src/api.rs +++ b/gen/appengine1_beta5/src/api.rs @@ -1775,25 +1775,15 @@ impl<'a, C> AppLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1801,13 +1791,15 @@ impl<'a, C> AppLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2063,25 +2055,15 @@ impl<'a, C> AppLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2089,13 +2071,15 @@ impl<'a, C> AppLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2349,25 +2333,15 @@ impl<'a, C> AppOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2375,13 +2349,15 @@ impl<'a, C> AppOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2637,25 +2613,15 @@ impl<'a, C> AppOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2663,13 +2629,15 @@ impl<'a, C> AppOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2948,25 +2916,15 @@ impl<'a, C> AppServiceVersionInstanceDebugCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2974,13 +2932,15 @@ impl<'a, C> AppServiceVersionInstanceDebugCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3256,25 +3216,15 @@ impl<'a, C> AppServiceVersionInstanceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3282,13 +3232,15 @@ impl<'a, C> AppServiceVersionInstanceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3555,25 +3507,15 @@ impl<'a, C> AppServiceVersionInstanceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3581,13 +3523,15 @@ impl<'a, C> AppServiceVersionInstanceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3862,25 +3806,15 @@ impl<'a, C> AppServiceVersionInstanceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3888,13 +3822,15 @@ impl<'a, C> AppServiceVersionInstanceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4182,25 +4118,15 @@ impl<'a, C> AppServiceVersionCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4208,13 +4134,15 @@ impl<'a, C> AppServiceVersionCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4468,25 +4396,15 @@ impl<'a, C> AppServiceVersionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4494,13 +4412,15 @@ impl<'a, C> AppServiceVersionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4760,25 +4680,15 @@ impl<'a, C> AppServiceVersionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4786,13 +4696,15 @@ impl<'a, C> AppServiceVersionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5067,25 +4979,15 @@ impl<'a, C> AppServiceVersionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5093,13 +4995,15 @@ impl<'a, C> AppServiceVersionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5395,25 +5299,15 @@ impl<'a, C> AppServiceVersionPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5421,13 +5315,15 @@ impl<'a, C> AppServiceVersionPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5696,25 +5592,15 @@ impl<'a, C> AppServiceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5722,13 +5608,15 @@ impl<'a, C> AppServiceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5971,25 +5859,15 @@ impl<'a, C> AppServiceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5997,13 +5875,15 @@ impl<'a, C> AppServiceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6254,25 +6134,15 @@ impl<'a, C> AppServiceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6280,13 +6150,15 @@ impl<'a, C> AppServiceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6564,25 +6436,15 @@ impl<'a, C> AppServicePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6590,13 +6452,15 @@ impl<'a, C> AppServicePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6860,25 +6724,15 @@ impl<'a, C> AppCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6886,13 +6740,15 @@ impl<'a, C> AppCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7127,25 +6983,15 @@ impl<'a, C> AppGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7153,13 +6999,15 @@ impl<'a, C> AppGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7425,25 +7273,15 @@ impl<'a, C> AppPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7451,13 +7289,15 @@ impl<'a, C> AppPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/appengine1_beta5/src/client.rs b/gen/appengine1_beta5/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/appengine1_beta5/src/client.rs +++ b/gen/appengine1_beta5/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/appsactivity1-cli/src/main.rs b/gen/appsactivity1-cli/src/main.rs index 083f29bc2b..20ab218f9c 100644 --- a/gen/appsactivity1-cli/src/main.rs +++ b/gen/appsactivity1-cli/src/main.rs @@ -82,7 +82,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["grouping-strategy", "user-id", "source", "page-size", "drive-file-id", "page-token", "drive-ancestor-id"].iter().map(|v|*v)); + v.extend(["drive-ancestor-id", "drive-file-id", "grouping-strategy", "page-size", "page-token", "source", "user-id"].iter().map(|v|*v)); v } )); } } diff --git a/gen/appsactivity1/src/api.rs b/gen/appsactivity1/src/api.rs index 790d210a7f..9899939e50 100644 --- a/gen/appsactivity1/src/api.rs +++ b/gen/appsactivity1/src/api.rs @@ -612,25 +612,15 @@ impl<'a, C> ActivityListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -638,13 +628,15 @@ impl<'a, C> ActivityListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/appsactivity1/src/client.rs b/gen/appsactivity1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/appsactivity1/src/client.rs +++ b/gen/appsactivity1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/appstate1/src/api.rs b/gen/appstate1/src/api.rs index 1eb6bc4fcc..aa7e7ba46c 100644 --- a/gen/appstate1/src/api.rs +++ b/gen/appstate1/src/api.rs @@ -542,25 +542,15 @@ impl<'a, C> StateClearCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -568,13 +558,15 @@ impl<'a, C> StateClearCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -807,25 +799,15 @@ impl<'a, C> StateDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -833,11 +815,11 @@ impl<'a, C> StateDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -1058,25 +1040,15 @@ impl<'a, C> StateGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1084,13 +1056,15 @@ impl<'a, C> StateGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1299,25 +1273,15 @@ impl<'a, C> StateListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1325,13 +1289,15 @@ impl<'a, C> StateListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1581,25 +1547,15 @@ impl<'a, C> StateUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1607,13 +1563,15 @@ impl<'a, C> StateUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/appstate1/src/client.rs b/gen/appstate1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/appstate1/src/client.rs +++ b/gen/appstate1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/area120tables1_alpha1-cli/src/main.rs b/gen/area120tables1_alpha1-cli/src/main.rs index f670309b08..10ae490237 100644 --- a/gen/area120tables1_alpha1-cli/src/main.rs +++ b/gen/area120tables1_alpha1-cli/src/main.rs @@ -636,7 +636,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["view", "page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token", "view"].iter().map(|v|*v)); v } )); } } @@ -730,7 +730,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["view", "update-mask"].iter().map(|v|*v)); + v.extend(["update-mask", "view"].iter().map(|v|*v)); v } )); } } diff --git a/gen/area120tables1_alpha1/src/api.rs b/gen/area120tables1_alpha1/src/api.rs index 7f23072de5..f2d8ba64c8 100644 --- a/gen/area120tables1_alpha1/src/api.rs +++ b/gen/area120tables1_alpha1/src/api.rs @@ -1037,25 +1037,15 @@ impl<'a, C> TableRowBatchCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1063,13 +1053,15 @@ impl<'a, C> TableRowBatchCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1334,25 +1326,15 @@ impl<'a, C> TableRowBatchDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1360,13 +1342,15 @@ impl<'a, C> TableRowBatchDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1631,25 +1615,15 @@ impl<'a, C> TableRowBatchUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1657,13 +1631,15 @@ impl<'a, C> TableRowBatchUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1933,25 +1909,15 @@ impl<'a, C> TableRowCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1959,13 +1925,15 @@ impl<'a, C> TableRowCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2216,25 +2184,15 @@ impl<'a, C> TableRowDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2242,13 +2200,15 @@ impl<'a, C> TableRowDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2488,25 +2448,15 @@ impl<'a, C> TableRowGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2514,13 +2464,15 @@ impl<'a, C> TableRowGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2782,25 +2734,15 @@ impl<'a, C> TableRowListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2808,13 +2750,15 @@ impl<'a, C> TableRowListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3108,25 +3052,15 @@ impl<'a, C> TableRowPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3134,13 +3068,15 @@ impl<'a, C> TableRowPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3398,25 +3334,15 @@ impl<'a, C> TableGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3424,13 +3350,15 @@ impl<'a, C> TableGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3648,25 +3576,15 @@ impl<'a, C> TableListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3674,13 +3592,15 @@ impl<'a, C> TableListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3919,25 +3839,15 @@ impl<'a, C> WorkspaceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3945,13 +3855,15 @@ impl<'a, C> WorkspaceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4169,25 +4081,15 @@ impl<'a, C> WorkspaceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4195,13 +4097,15 @@ impl<'a, C> WorkspaceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/area120tables1_alpha1/src/client.rs b/gen/area120tables1_alpha1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/area120tables1_alpha1/src/client.rs +++ b/gen/area120tables1_alpha1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/artifactregistry1-cli/src/main.rs b/gen/artifactregistry1-cli/src/main.rs index a866b300e8..079abbd099 100644 --- a/gen/artifactregistry1-cli/src/main.rs +++ b/gen/artifactregistry1-cli/src/main.rs @@ -261,7 +261,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "name", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "name", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/artifactregistry1/src/api.rs b/gen/artifactregistry1/src/api.rs index 3dcbb4af3d..f3b1c8ac91 100644 --- a/gen/artifactregistry1/src/api.rs +++ b/gen/artifactregistry1/src/api.rs @@ -665,25 +665,15 @@ impl<'a, C> OperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -691,13 +681,15 @@ impl<'a, C> OperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -941,25 +933,15 @@ impl<'a, C> OperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -967,13 +949,15 @@ impl<'a, C> OperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1208,25 +1192,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1234,13 +1208,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1468,25 +1444,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1494,13 +1460,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1763,25 +1731,15 @@ impl<'a, C> ProjectLocationRepositoryDockerImageListCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1789,13 +1747,15 @@ impl<'a, C> ProjectLocationRepositoryDockerImageListCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/artifactregistry1/src/client.rs b/gen/artifactregistry1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/artifactregistry1/src/client.rs +++ b/gen/artifactregistry1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/artifactregistry1_beta1-cli/src/main.rs b/gen/artifactregistry1_beta1-cli/src/main.rs index b0e607be24..d5fc23052f 100644 --- a/gen/artifactregistry1_beta1-cli/src/main.rs +++ b/gen/artifactregistry1_beta1-cli/src/main.rs @@ -122,7 +122,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -236,7 +236,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -497,7 +497,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1083,7 +1083,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1350,7 +1350,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["view", "order-by", "page-size", "page-token"].iter().map(|v|*v)); + v.extend(["order-by", "page-size", "page-token", "view"].iter().map(|v|*v)); v } )); } } diff --git a/gen/artifactregistry1_beta1/src/api.rs b/gen/artifactregistry1_beta1/src/api.rs index ba72b8427d..3122141122 100644 --- a/gen/artifactregistry1_beta1/src/api.rs +++ b/gen/artifactregistry1_beta1/src/api.rs @@ -1342,25 +1342,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1368,13 +1358,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1624,25 +1616,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1650,13 +1632,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1912,25 +1896,15 @@ impl<'a, C> ProjectLocationRepositoryFileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1938,13 +1912,15 @@ impl<'a, C> ProjectLocationRepositoryFileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2194,25 +2170,15 @@ impl<'a, C> ProjectLocationRepositoryFileListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2220,13 +2186,15 @@ impl<'a, C> ProjectLocationRepositoryFileListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2508,25 +2476,15 @@ impl<'a, C> ProjectLocationRepositoryPackageTagCreateCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2534,13 +2492,15 @@ impl<'a, C> ProjectLocationRepositoryPackageTagCreateCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2791,25 +2751,15 @@ impl<'a, C> ProjectLocationRepositoryPackageTagDeleteCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2817,13 +2767,15 @@ impl<'a, C> ProjectLocationRepositoryPackageTagDeleteCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3058,25 +3010,15 @@ impl<'a, C> ProjectLocationRepositoryPackageTagGetCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3084,13 +3026,15 @@ impl<'a, C> ProjectLocationRepositoryPackageTagGetCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3340,25 +3284,15 @@ impl<'a, C> ProjectLocationRepositoryPackageTagListCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3366,13 +3300,15 @@ impl<'a, C> ProjectLocationRepositoryPackageTagListCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3654,25 +3590,15 @@ impl<'a, C> ProjectLocationRepositoryPackageTagPatchCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3680,13 +3606,15 @@ impl<'a, C> ProjectLocationRepositoryPackageTagPatchCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3942,25 +3870,15 @@ impl<'a, C> ProjectLocationRepositoryPackageVersionDeleteCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3968,13 +3886,15 @@ impl<'a, C> ProjectLocationRepositoryPackageVersionDeleteCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4221,25 +4141,15 @@ impl<'a, C> ProjectLocationRepositoryPackageVersionGetCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4247,13 +4157,15 @@ impl<'a, C> ProjectLocationRepositoryPackageVersionGetCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4515,25 +4427,15 @@ impl<'a, C> ProjectLocationRepositoryPackageVersionListCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4541,13 +4443,15 @@ impl<'a, C> ProjectLocationRepositoryPackageVersionListCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4810,25 +4714,15 @@ impl<'a, C> ProjectLocationRepositoryPackageDeleteCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4836,13 +4730,15 @@ impl<'a, C> ProjectLocationRepositoryPackageDeleteCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5077,25 +4973,15 @@ impl<'a, C> ProjectLocationRepositoryPackageGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5103,13 +4989,15 @@ impl<'a, C> ProjectLocationRepositoryPackageGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5354,25 +5242,15 @@ impl<'a, C> ProjectLocationRepositoryPackageListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5380,13 +5258,15 @@ impl<'a, C> ProjectLocationRepositoryPackageListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5661,25 +5541,15 @@ impl<'a, C> ProjectLocationRepositoryCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5687,13 +5557,15 @@ impl<'a, C> ProjectLocationRepositoryCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5944,25 +5816,15 @@ impl<'a, C> ProjectLocationRepositoryDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5970,13 +5832,15 @@ impl<'a, C> ProjectLocationRepositoryDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6211,25 +6075,15 @@ impl<'a, C> ProjectLocationRepositoryGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6237,13 +6091,15 @@ impl<'a, C> ProjectLocationRepositoryGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6483,25 +6339,15 @@ impl<'a, C> ProjectLocationRepositoryGetIamPolicyCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6509,13 +6355,15 @@ impl<'a, C> ProjectLocationRepositoryGetIamPolicyCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6767,25 +6615,15 @@ impl<'a, C> ProjectLocationRepositoryListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6793,13 +6631,15 @@ impl<'a, C> ProjectLocationRepositoryListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7074,25 +6914,15 @@ impl<'a, C> ProjectLocationRepositoryPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7100,13 +6930,15 @@ impl<'a, C> ProjectLocationRepositoryPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7378,25 +7210,15 @@ impl<'a, C> ProjectLocationRepositorySetIamPolicyCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7404,13 +7226,15 @@ impl<'a, C> ProjectLocationRepositorySetIamPolicyCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7675,25 +7499,15 @@ impl<'a, C> ProjectLocationRepositoryTestIamPermissionCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7701,13 +7515,15 @@ impl<'a, C> ProjectLocationRepositoryTestIamPermissionCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7951,25 +7767,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7977,13 +7783,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8233,25 +8041,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8259,13 +8057,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/artifactregistry1_beta1/src/client.rs b/gen/artifactregistry1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/artifactregistry1_beta1/src/client.rs +++ b/gen/artifactregistry1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/assuredworkloads1-cli/src/main.rs b/gen/assuredworkloads1-cli/src/main.rs index 52f43c6c18..f67cdb0e8d 100644 --- a/gen/assuredworkloads1-cli/src/main.rs +++ b/gen/assuredworkloads1-cli/src/main.rs @@ -122,7 +122,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -390,7 +390,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/assuredworkloads1/src/api.rs b/gen/assuredworkloads1/src/api.rs index 745db60edf..ade6be07b4 100644 --- a/gen/assuredworkloads1/src/api.rs +++ b/gen/assuredworkloads1/src/api.rs @@ -674,25 +674,15 @@ impl<'a, C> OrganizationLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -700,13 +690,15 @@ impl<'a, C> OrganizationLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -956,25 +948,15 @@ impl<'a, C> OrganizationLocationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -982,13 +964,15 @@ impl<'a, C> OrganizationLocationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1270,25 +1254,15 @@ impl<'a, C> OrganizationLocationWorkloadCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1296,13 +1270,15 @@ impl<'a, C> OrganizationLocationWorkloadCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1558,25 +1534,15 @@ impl<'a, C> OrganizationLocationWorkloadDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1584,13 +1550,15 @@ impl<'a, C> OrganizationLocationWorkloadDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1832,25 +1800,15 @@ impl<'a, C> OrganizationLocationWorkloadGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1858,13 +1816,15 @@ impl<'a, C> OrganizationLocationWorkloadGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2114,25 +2074,15 @@ impl<'a, C> OrganizationLocationWorkloadListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2140,13 +2090,15 @@ impl<'a, C> OrganizationLocationWorkloadListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2428,25 +2380,15 @@ impl<'a, C> OrganizationLocationWorkloadPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2454,13 +2396,15 @@ impl<'a, C> OrganizationLocationWorkloadPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/assuredworkloads1/src/client.rs b/gen/assuredworkloads1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/assuredworkloads1/src/client.rs +++ b/gen/assuredworkloads1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/autoscaler1_beta2-cli/src/main.rs b/gen/autoscaler1_beta2-cli/src/main.rs index d35be43bae..85e6cfcc47 100644 --- a/gen/autoscaler1_beta2-cli/src/main.rs +++ b/gen/autoscaler1_beta2-cli/src/main.rs @@ -270,7 +270,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results", "filter"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -620,7 +620,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results", "filter"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -682,7 +682,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results", "filter"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/autoscaler1_beta2/src/api.rs b/gen/autoscaler1_beta2/src/api.rs index fc41f94181..d084d7227f 100644 --- a/gen/autoscaler1_beta2/src/api.rs +++ b/gen/autoscaler1_beta2/src/api.rs @@ -1090,25 +1090,15 @@ impl<'a, C> AutoscalerDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1116,13 +1106,15 @@ impl<'a, C> AutoscalerDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1373,25 +1365,15 @@ impl<'a, C> AutoscalerGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1399,13 +1381,15 @@ impl<'a, C> AutoscalerGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1675,25 +1659,15 @@ impl<'a, C> AutoscalerInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1701,13 +1675,15 @@ impl<'a, C> AutoscalerInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1970,25 +1946,15 @@ impl<'a, C> AutoscalerListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1996,13 +1962,15 @@ impl<'a, C> AutoscalerListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2282,25 +2250,15 @@ impl<'a, C> AutoscalerPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2308,13 +2266,15 @@ impl<'a, C> AutoscalerPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2595,25 +2555,15 @@ impl<'a, C> AutoscalerUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2621,13 +2571,15 @@ impl<'a, C> AutoscalerUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2886,25 +2838,15 @@ impl<'a, C> ZoneOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2912,11 +2854,11 @@ impl<'a, C> ZoneOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -3158,25 +3100,15 @@ impl<'a, C> ZoneOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3184,13 +3116,15 @@ impl<'a, C> ZoneOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3451,25 +3385,15 @@ impl<'a, C> ZoneOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3477,13 +3401,15 @@ impl<'a, C> ZoneOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3751,25 +3677,15 @@ impl<'a, C> ZoneListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3777,13 +3693,15 @@ impl<'a, C> ZoneListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/autoscaler1_beta2/src/client.rs b/gen/autoscaler1_beta2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/autoscaler1_beta2/src/client.rs +++ b/gen/autoscaler1_beta2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/bigquery2-cli/src/main.rs b/gen/bigquery2-cli/src/main.rs index 61cd0cfd29..e9d7d41963 100644 --- a/gen/bigquery2-cli/src/main.rs +++ b/gen/bigquery2-cli/src/main.rs @@ -273,7 +273,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "page-token", "all", "max-results"].iter().map(|v|*v)); + v.extend(["all", "filter", "max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -701,7 +701,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "timeout-ms", "start-index", "location", "max-results"].iter().map(|v|*v)); + v.extend(["location", "max-results", "page-token", "start-index", "timeout-ms"].iter().map(|v|*v)); v } )); } } @@ -1025,7 +1025,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["min-creation-time", "page-token", "max-creation-time", "projection", "all-users", "state-filter", "parent-job-id", "max-results"].iter().map(|v|*v)); + v.extend(["all-users", "max-creation-time", "max-results", "min-creation-time", "page-token", "parent-job-id", "projection", "state-filter"].iter().map(|v|*v)); v } )); } } @@ -1280,7 +1280,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1489,7 +1489,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1751,7 +1751,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "read-mask", "filter", "max-results"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "page-token", "read-mask"].iter().map(|v|*v)); v } )); } } @@ -1992,7 +1992,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2317,7 +2317,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["selected-fields", "page-token", "start-index", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "selected-fields", "start-index"].iter().map(|v|*v)); v } )); } } @@ -2713,7 +2713,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/bigquery2/src/api.rs b/gen/bigquery2/src/api.rs index 2c27cf8bee..e302827e63 100644 --- a/gen/bigquery2/src/api.rs +++ b/gen/bigquery2/src/api.rs @@ -5265,25 +5265,15 @@ impl<'a, C> DatasetDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5291,11 +5281,11 @@ impl<'a, C> DatasetDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -5535,25 +5525,15 @@ impl<'a, C> DatasetGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5561,13 +5541,15 @@ impl<'a, C> DatasetGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5825,25 +5807,15 @@ impl<'a, C> DatasetInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5851,13 +5823,15 @@ impl<'a, C> DatasetInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6113,25 +6087,15 @@ impl<'a, C> DatasetListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6139,13 +6103,15 @@ impl<'a, C> DatasetListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6423,25 +6389,15 @@ impl<'a, C> DatasetPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6449,13 +6405,15 @@ impl<'a, C> DatasetPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6724,25 +6682,15 @@ impl<'a, C> DatasetUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6750,13 +6698,15 @@ impl<'a, C> DatasetUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7009,25 +6959,15 @@ impl<'a, C> JobCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7035,13 +6975,15 @@ impl<'a, C> JobCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7295,25 +7237,15 @@ impl<'a, C> JobDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7321,11 +7253,11 @@ impl<'a, C> JobDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -7570,25 +7502,15 @@ impl<'a, C> JobGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7596,13 +7518,15 @@ impl<'a, C> JobGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7873,25 +7797,15 @@ impl<'a, C> JobGetQueryResultCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7899,13 +7813,15 @@ impl<'a, C> JobGetQueryResultCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8241,25 +8157,15 @@ impl<'a, C> JobInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8267,7 +8173,7 @@ impl<'a, C> JobInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -8277,7 +8183,7 @@ impl<'a, C> JobInsertCall<'a, C> where C: BorrowMut JobInsertCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8620,25 +8528,15 @@ impl<'a, C> JobListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8646,13 +8544,15 @@ impl<'a, C> JobListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8957,25 +8857,15 @@ impl<'a, C> JobQueryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8983,13 +8873,15 @@ impl<'a, C> JobQueryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9232,25 +9124,15 @@ impl<'a, C> ModelDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9258,11 +9140,11 @@ impl<'a, C> ModelDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -9511,25 +9393,15 @@ impl<'a, C> ModelGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9537,13 +9409,15 @@ impl<'a, C> ModelGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9806,25 +9680,15 @@ impl<'a, C> ModelListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9832,13 +9696,15 @@ impl<'a, C> ModelListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10118,25 +9984,15 @@ impl<'a, C> ModelPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10144,13 +10000,15 @@ impl<'a, C> ModelPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10406,25 +10264,15 @@ impl<'a, C> ProjectGetServiceAccountCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10432,13 +10280,15 @@ impl<'a, C> ProjectGetServiceAccountCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10652,25 +10502,15 @@ impl<'a, C> ProjectListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10678,13 +10518,15 @@ impl<'a, C> ProjectListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10922,25 +10764,15 @@ impl<'a, C> RoutineDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10948,11 +10780,11 @@ impl<'a, C> RoutineDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -11206,25 +11038,15 @@ impl<'a, C> RoutineGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11232,13 +11054,15 @@ impl<'a, C> RoutineGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11519,25 +11343,15 @@ impl<'a, C> RoutineInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11545,13 +11359,15 @@ impl<'a, C> RoutineInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11823,25 +11639,15 @@ impl<'a, C> RoutineListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11849,13 +11655,15 @@ impl<'a, C> RoutineListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12149,25 +11957,15 @@ impl<'a, C> RoutineUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12175,13 +11973,15 @@ impl<'a, C> RoutineUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12462,25 +12262,15 @@ impl<'a, C> RowAccessPolicyGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12488,13 +12278,15 @@ impl<'a, C> RowAccessPolicyGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12748,25 +12540,15 @@ impl<'a, C> RowAccessPolicyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12774,13 +12556,15 @@ impl<'a, C> RowAccessPolicyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13066,25 +12850,15 @@ impl<'a, C> RowAccessPolicySetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13092,13 +12866,15 @@ impl<'a, C> RowAccessPolicySetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13359,25 +13135,15 @@ impl<'a, C> RowAccessPolicyTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13385,13 +13151,15 @@ impl<'a, C> RowAccessPolicyTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13652,25 +13420,15 @@ impl<'a, C> TabledataInsertAllCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13678,13 +13436,15 @@ impl<'a, C> TabledataInsertAllCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13964,25 +13724,15 @@ impl<'a, C> TabledataListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13990,13 +13740,15 @@ impl<'a, C> TabledataListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14274,25 +14026,15 @@ impl<'a, C> TableDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14300,11 +14042,11 @@ impl<'a, C> TableDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -14554,25 +14296,15 @@ impl<'a, C> TableGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14580,13 +14312,15 @@ impl<'a, C> TableGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14865,25 +14599,15 @@ impl<'a, C> TableGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14891,13 +14615,15 @@ impl<'a, C> TableGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15156,25 +14882,15 @@ impl<'a, C> TableInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15182,13 +14898,15 @@ impl<'a, C> TableInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15446,25 +15164,15 @@ impl<'a, C> TableListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15472,13 +15180,15 @@ impl<'a, C> TableListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15754,25 +15464,15 @@ impl<'a, C> TablePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15780,13 +15480,15 @@ impl<'a, C> TablePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16067,25 +15769,15 @@ impl<'a, C> TableSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16093,13 +15785,15 @@ impl<'a, C> TableSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16360,25 +16054,15 @@ impl<'a, C> TableTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16386,13 +16070,15 @@ impl<'a, C> TableTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16653,25 +16339,15 @@ impl<'a, C> TableUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16679,13 +16355,15 @@ impl<'a, C> TableUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/bigquery2/src/client.rs b/gen/bigquery2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/bigquery2/src/client.rs +++ b/gen/bigquery2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/bigqueryconnection1_beta1/src/api.rs b/gen/bigqueryconnection1_beta1/src/api.rs index 05f30d4b27..1535f26801 100644 --- a/gen/bigqueryconnection1_beta1/src/api.rs +++ b/gen/bigqueryconnection1_beta1/src/api.rs @@ -875,25 +875,15 @@ impl<'a, C> ProjectLocationConnectionCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -901,13 +891,15 @@ impl<'a, C> ProjectLocationConnectionCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1158,25 +1150,15 @@ impl<'a, C> ProjectLocationConnectionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1184,13 +1166,15 @@ impl<'a, C> ProjectLocationConnectionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1425,25 +1409,15 @@ impl<'a, C> ProjectLocationConnectionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1451,13 +1425,15 @@ impl<'a, C> ProjectLocationConnectionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1713,25 +1689,15 @@ impl<'a, C> ProjectLocationConnectionGetIamPolicyCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1739,13 +1705,15 @@ impl<'a, C> ProjectLocationConnectionGetIamPolicyCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1999,25 +1967,15 @@ impl<'a, C> ProjectLocationConnectionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2025,13 +1983,15 @@ impl<'a, C> ProjectLocationConnectionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2306,25 +2266,15 @@ impl<'a, C> ProjectLocationConnectionPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2332,13 +2282,15 @@ impl<'a, C> ProjectLocationConnectionPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2610,25 +2562,15 @@ impl<'a, C> ProjectLocationConnectionSetIamPolicyCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2636,13 +2578,15 @@ impl<'a, C> ProjectLocationConnectionSetIamPolicyCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2907,25 +2851,15 @@ impl<'a, C> ProjectLocationConnectionTestIamPermissionCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2933,13 +2867,15 @@ impl<'a, C> ProjectLocationConnectionTestIamPermissionCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3204,25 +3140,15 @@ impl<'a, C> ProjectLocationConnectionUpdateCredentialCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3230,13 +3156,15 @@ impl<'a, C> ProjectLocationConnectionUpdateCredentialCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/bigqueryconnection1_beta1/src/client.rs b/gen/bigqueryconnection1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/bigqueryconnection1_beta1/src/client.rs +++ b/gen/bigqueryconnection1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/bigquerydatatransfer1-cli/src/main.rs b/gen/bigquerydatatransfer1-cli/src/main.rs index 4ee8d6d7a0..c492eacdf3 100644 --- a/gen/bigquerydatatransfer1-cli/src/main.rs +++ b/gen/bigquerydatatransfer1-cli/src/main.rs @@ -203,7 +203,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -398,7 +398,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -512,7 +512,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -623,7 +623,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["service-account-name", "authorization-code", "version-info"].iter().map(|v|*v)); + v.extend(["authorization-code", "service-account-name", "version-info"].iter().map(|v|*v)); v } )); } } @@ -789,7 +789,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "data-source-ids", "page-size"].iter().map(|v|*v)); + v.extend(["data-source-ids", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -903,7 +903,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["service-account-name", "update-mask", "authorization-code", "version-info"].iter().map(|v|*v)); + v.extend(["authorization-code", "service-account-name", "update-mask", "version-info"].iter().map(|v|*v)); v } )); } } @@ -1072,7 +1072,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "states", "run-attempt", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "run-attempt", "states"].iter().map(|v|*v)); v } )); } } @@ -1134,7 +1134,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "message-types", "page-size"].iter().map(|v|*v)); + v.extend(["message-types", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1418,7 +1418,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["service-account-name", "authorization-code", "version-info"].iter().map(|v|*v)); + v.extend(["authorization-code", "service-account-name", "version-info"].iter().map(|v|*v)); v } )); } } @@ -1584,7 +1584,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "data-source-ids", "page-size"].iter().map(|v|*v)); + v.extend(["data-source-ids", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1698,7 +1698,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["service-account-name", "update-mask", "authorization-code", "version-info"].iter().map(|v|*v)); + v.extend(["authorization-code", "service-account-name", "update-mask", "version-info"].iter().map(|v|*v)); v } )); } } @@ -1867,7 +1867,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "states", "run-attempt", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "run-attempt", "states"].iter().map(|v|*v)); v } )); } } @@ -1929,7 +1929,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "message-types", "page-size"].iter().map(|v|*v)); + v.extend(["message-types", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/bigquerydatatransfer1/src/api.rs b/gen/bigquerydatatransfer1/src/api.rs index ee5675d585..f172e4440a 100644 --- a/gen/bigquerydatatransfer1/src/api.rs +++ b/gen/bigquerydatatransfer1/src/api.rs @@ -1577,25 +1577,15 @@ impl<'a, C> ProjectDataSourceCheckValidCredCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1603,13 +1593,15 @@ impl<'a, C> ProjectDataSourceCheckValidCredCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1853,25 +1845,15 @@ impl<'a, C> ProjectDataSourceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1879,13 +1861,15 @@ impl<'a, C> ProjectDataSourceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2130,25 +2114,15 @@ impl<'a, C> ProjectDataSourceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2156,13 +2130,15 @@ impl<'a, C> ProjectDataSourceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2432,25 +2408,15 @@ impl<'a, C> ProjectLocationDataSourceCheckValidCredCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2458,13 +2424,15 @@ impl<'a, C> ProjectLocationDataSourceCheckValidCredCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2708,25 +2676,15 @@ impl<'a, C> ProjectLocationDataSourceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2734,13 +2692,15 @@ impl<'a, C> ProjectLocationDataSourceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2985,25 +2945,15 @@ impl<'a, C> ProjectLocationDataSourceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3011,13 +2961,15 @@ impl<'a, C> ProjectLocationDataSourceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3283,25 +3235,15 @@ impl<'a, C> ProjectLocationTransferConfigRunTransferLogListCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3309,13 +3251,15 @@ impl<'a, C> ProjectLocationTransferConfigRunTransferLogListCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3572,25 +3516,15 @@ impl<'a, C> ProjectLocationTransferConfigRunDeleteCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3598,13 +3532,15 @@ impl<'a, C> ProjectLocationTransferConfigRunDeleteCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3839,25 +3775,15 @@ impl<'a, C> ProjectLocationTransferConfigRunGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3865,13 +3791,15 @@ impl<'a, C> ProjectLocationTransferConfigRunGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4128,25 +4056,15 @@ impl<'a, C> ProjectLocationTransferConfigRunListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4154,13 +4072,15 @@ impl<'a, C> ProjectLocationTransferConfigRunListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4460,25 +4380,15 @@ impl<'a, C> ProjectLocationTransferConfigCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4486,13 +4396,15 @@ impl<'a, C> ProjectLocationTransferConfigCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4757,25 +4669,15 @@ impl<'a, C> ProjectLocationTransferConfigDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4783,13 +4685,15 @@ impl<'a, C> ProjectLocationTransferConfigDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5024,25 +4928,15 @@ impl<'a, C> ProjectLocationTransferConfigGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5050,13 +4944,15 @@ impl<'a, C> ProjectLocationTransferConfigGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5308,25 +5204,15 @@ impl<'a, C> ProjectLocationTransferConfigListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5334,13 +5220,15 @@ impl<'a, C> ProjectLocationTransferConfigListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5638,25 +5526,15 @@ impl<'a, C> ProjectLocationTransferConfigPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5664,13 +5542,15 @@ impl<'a, C> ProjectLocationTransferConfigPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5963,25 +5843,15 @@ impl<'a, C> ProjectLocationTransferConfigScheduleRunCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5989,13 +5859,15 @@ impl<'a, C> ProjectLocationTransferConfigScheduleRunCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6260,25 +6132,15 @@ impl<'a, C> ProjectLocationTransferConfigStartManualRunCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6286,13 +6148,15 @@ impl<'a, C> ProjectLocationTransferConfigStartManualRunCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6536,25 +6400,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6562,13 +6416,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6818,25 +6674,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6844,13 +6690,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7123,25 +6971,15 @@ impl<'a, C> ProjectTransferConfigRunTransferLogListCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7149,13 +6987,15 @@ impl<'a, C> ProjectTransferConfigRunTransferLogListCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7412,25 +7252,15 @@ impl<'a, C> ProjectTransferConfigRunDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7438,13 +7268,15 @@ impl<'a, C> ProjectTransferConfigRunDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7679,25 +7511,15 @@ impl<'a, C> ProjectTransferConfigRunGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7705,13 +7527,15 @@ impl<'a, C> ProjectTransferConfigRunGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7968,25 +7792,15 @@ impl<'a, C> ProjectTransferConfigRunListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7994,13 +7808,15 @@ impl<'a, C> ProjectTransferConfigRunListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8300,25 +8116,15 @@ impl<'a, C> ProjectTransferConfigCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8326,13 +8132,15 @@ impl<'a, C> ProjectTransferConfigCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8597,25 +8405,15 @@ impl<'a, C> ProjectTransferConfigDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8623,13 +8421,15 @@ impl<'a, C> ProjectTransferConfigDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8864,25 +8664,15 @@ impl<'a, C> ProjectTransferConfigGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8890,13 +8680,15 @@ impl<'a, C> ProjectTransferConfigGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9148,25 +8940,15 @@ impl<'a, C> ProjectTransferConfigListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9174,13 +8956,15 @@ impl<'a, C> ProjectTransferConfigListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9478,25 +9262,15 @@ impl<'a, C> ProjectTransferConfigPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9504,13 +9278,15 @@ impl<'a, C> ProjectTransferConfigPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9803,25 +9579,15 @@ impl<'a, C> ProjectTransferConfigScheduleRunCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9829,13 +9595,15 @@ impl<'a, C> ProjectTransferConfigScheduleRunCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10100,25 +9868,15 @@ impl<'a, C> ProjectTransferConfigStartManualRunCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10126,13 +9884,15 @@ impl<'a, C> ProjectTransferConfigStartManualRunCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/bigquerydatatransfer1/src/client.rs b/gen/bigquerydatatransfer1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/bigquerydatatransfer1/src/client.rs +++ b/gen/bigquerydatatransfer1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/bigqueryreservation1-cli/src/main.rs b/gen/bigqueryreservation1-cli/src/main.rs index 3393cb710f..64c89b4a23 100644 --- a/gen/bigqueryreservation1-cli/src/main.rs +++ b/gen/bigqueryreservation1-cli/src/main.rs @@ -268,7 +268,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -786,7 +786,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1127,7 +1127,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1282,7 +1282,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "query", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "query"].iter().map(|v|*v)); v } )); } } @@ -1344,7 +1344,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "query", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "query"].iter().map(|v|*v)); v } )); } } diff --git a/gen/bigqueryreservation1/src/api.rs b/gen/bigqueryreservation1/src/api.rs index e921ecf1ec..f00bf7e4ca 100644 --- a/gen/bigqueryreservation1/src/api.rs +++ b/gen/bigqueryreservation1/src/api.rs @@ -1110,25 +1110,15 @@ impl<'a, C> ProjectLocationCapacityCommitmentCreateCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1136,13 +1126,15 @@ impl<'a, C> ProjectLocationCapacityCommitmentCreateCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1393,25 +1385,15 @@ impl<'a, C> ProjectLocationCapacityCommitmentDeleteCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1419,13 +1401,15 @@ impl<'a, C> ProjectLocationCapacityCommitmentDeleteCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1660,25 +1644,15 @@ impl<'a, C> ProjectLocationCapacityCommitmentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1686,13 +1660,15 @@ impl<'a, C> ProjectLocationCapacityCommitmentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1937,25 +1913,15 @@ impl<'a, C> ProjectLocationCapacityCommitmentListCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1963,13 +1929,15 @@ impl<'a, C> ProjectLocationCapacityCommitmentListCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2239,25 +2207,15 @@ impl<'a, C> ProjectLocationCapacityCommitmentMergeCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2265,13 +2223,15 @@ impl<'a, C> ProjectLocationCapacityCommitmentMergeCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2541,25 +2501,15 @@ impl<'a, C> ProjectLocationCapacityCommitmentPatchCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2567,13 +2517,15 @@ impl<'a, C> ProjectLocationCapacityCommitmentPatchCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2845,25 +2797,15 @@ impl<'a, C> ProjectLocationCapacityCommitmentSplitCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2871,13 +2813,15 @@ impl<'a, C> ProjectLocationCapacityCommitmentSplitCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3142,25 +3086,15 @@ impl<'a, C> ProjectLocationReservationAssignmentCreateCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3168,13 +3102,15 @@ impl<'a, C> ProjectLocationReservationAssignmentCreateCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3418,25 +3354,15 @@ impl<'a, C> ProjectLocationReservationAssignmentDeleteCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3444,13 +3370,15 @@ impl<'a, C> ProjectLocationReservationAssignmentDeleteCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3695,25 +3623,15 @@ impl<'a, C> ProjectLocationReservationAssignmentListCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3721,13 +3639,15 @@ impl<'a, C> ProjectLocationReservationAssignmentListCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3997,25 +3917,15 @@ impl<'a, C> ProjectLocationReservationAssignmentMoveCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4023,13 +3933,15 @@ impl<'a, C> ProjectLocationReservationAssignmentMoveCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4299,25 +4211,15 @@ impl<'a, C> ProjectLocationReservationCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4325,13 +4227,15 @@ impl<'a, C> ProjectLocationReservationCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4582,25 +4486,15 @@ impl<'a, C> ProjectLocationReservationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4608,13 +4502,15 @@ impl<'a, C> ProjectLocationReservationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4849,25 +4745,15 @@ impl<'a, C> ProjectLocationReservationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4875,13 +4761,15 @@ impl<'a, C> ProjectLocationReservationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5126,25 +5014,15 @@ impl<'a, C> ProjectLocationReservationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5152,13 +5030,15 @@ impl<'a, C> ProjectLocationReservationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5433,25 +5313,15 @@ impl<'a, C> ProjectLocationReservationPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5459,13 +5329,15 @@ impl<'a, C> ProjectLocationReservationPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5716,25 +5588,15 @@ impl<'a, C> ProjectLocationGetBiReservationCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5742,13 +5604,15 @@ impl<'a, C> ProjectLocationGetBiReservationCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5998,25 +5862,15 @@ impl<'a, C> ProjectLocationSearchAllAssignmentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6024,13 +5878,15 @@ impl<'a, C> ProjectLocationSearchAllAssignmentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6301,25 +6157,15 @@ impl<'a, C> ProjectLocationSearchAssignmentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6327,13 +6173,15 @@ impl<'a, C> ProjectLocationSearchAssignmentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6615,25 +6463,15 @@ impl<'a, C> ProjectLocationUpdateBiReservationCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6641,13 +6479,15 @@ impl<'a, C> ProjectLocationUpdateBiReservationCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/bigqueryreservation1/src/client.rs b/gen/bigqueryreservation1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/bigqueryreservation1/src/client.rs +++ b/gen/bigqueryreservation1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/bigtableadmin2-cli/src/main.rs b/gen/bigtableadmin2-cli/src/main.rs index 11f5f29402..c13768c38b 100644 --- a/gen/bigtableadmin2-cli/src/main.rs +++ b/gen/bigtableadmin2-cli/src/main.rs @@ -226,7 +226,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -322,7 +322,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["ignore-warnings", "app-profile-id"].iter().map(|v|*v)); + v.extend(["app-profile-id", "ignore-warnings"].iter().map(|v|*v)); v } )); } } @@ -585,7 +585,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["update-mask", "ignore-warnings"].iter().map(|v|*v)); + v.extend(["ignore-warnings", "update-mask"].iter().map(|v|*v)); v } )); } } @@ -938,7 +938,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["order-by", "page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2671,7 +2671,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["view", "page-size", "page-token"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "view"].iter().map(|v|*v)); v } )); } } @@ -3301,7 +3301,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/bigtableadmin2/src/api.rs b/gen/bigtableadmin2/src/api.rs index 96f5993c9e..ec0149fe84 100644 --- a/gen/bigtableadmin2/src/api.rs +++ b/gen/bigtableadmin2/src/api.rs @@ -2307,25 +2307,15 @@ impl<'a, C> OperationProjectOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2333,13 +2323,15 @@ impl<'a, C> OperationProjectOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2595,25 +2587,15 @@ impl<'a, C> OperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2621,13 +2603,15 @@ impl<'a, C> OperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2862,25 +2846,15 @@ impl<'a, C> OperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2888,13 +2862,15 @@ impl<'a, C> OperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3129,25 +3105,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3155,13 +3121,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3427,25 +3395,15 @@ impl<'a, C> ProjectInstanceAppProfileCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3453,13 +3411,15 @@ impl<'a, C> ProjectInstanceAppProfileCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3722,25 +3682,15 @@ impl<'a, C> ProjectInstanceAppProfileDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3748,13 +3698,15 @@ impl<'a, C> ProjectInstanceAppProfileDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3996,25 +3948,15 @@ impl<'a, C> ProjectInstanceAppProfileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4022,13 +3964,15 @@ impl<'a, C> ProjectInstanceAppProfileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4273,25 +4217,15 @@ impl<'a, C> ProjectInstanceAppProfileListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4299,13 +4233,15 @@ impl<'a, C> ProjectInstanceAppProfileListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4585,25 +4521,15 @@ impl<'a, C> ProjectInstanceAppProfilePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4611,13 +4537,15 @@ impl<'a, C> ProjectInstanceAppProfilePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4901,25 +4829,15 @@ impl<'a, C> ProjectInstanceClusterBackupCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4927,13 +4845,15 @@ impl<'a, C> ProjectInstanceClusterBackupCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5184,25 +5104,15 @@ impl<'a, C> ProjectInstanceClusterBackupDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5210,13 +5120,15 @@ impl<'a, C> ProjectInstanceClusterBackupDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5451,25 +5363,15 @@ impl<'a, C> ProjectInstanceClusterBackupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5477,13 +5379,15 @@ impl<'a, C> ProjectInstanceClusterBackupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5739,25 +5643,15 @@ impl<'a, C> ProjectInstanceClusterBackupGetIamPolicyCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5765,13 +5659,15 @@ impl<'a, C> ProjectInstanceClusterBackupGetIamPolicyCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6035,25 +5931,15 @@ impl<'a, C> ProjectInstanceClusterBackupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6061,13 +5947,15 @@ impl<'a, C> ProjectInstanceClusterBackupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6356,25 +6244,15 @@ impl<'a, C> ProjectInstanceClusterBackupPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6382,13 +6260,15 @@ impl<'a, C> ProjectInstanceClusterBackupPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6660,25 +6540,15 @@ impl<'a, C> ProjectInstanceClusterBackupSetIamPolicyCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6686,13 +6556,15 @@ impl<'a, C> ProjectInstanceClusterBackupSetIamPolicyCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6957,25 +6829,15 @@ impl<'a, C> ProjectInstanceClusterBackupTestIamPermissionCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6983,13 +6845,15 @@ impl<'a, C> ProjectInstanceClusterBackupTestIamPermissionCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7259,25 +7123,15 @@ impl<'a, C> ProjectInstanceClusterCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7285,13 +7139,15 @@ impl<'a, C> ProjectInstanceClusterCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7542,25 +7398,15 @@ impl<'a, C> ProjectInstanceClusterDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7568,13 +7414,15 @@ impl<'a, C> ProjectInstanceClusterDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7809,25 +7657,15 @@ impl<'a, C> ProjectInstanceClusterGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7835,13 +7673,15 @@ impl<'a, C> ProjectInstanceClusterGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8081,25 +7921,15 @@ impl<'a, C> ProjectInstanceClusterListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8107,13 +7937,15 @@ impl<'a, C> ProjectInstanceClusterListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8376,25 +8208,15 @@ impl<'a, C> ProjectInstanceClusterUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8402,13 +8224,15 @@ impl<'a, C> ProjectInstanceClusterUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8673,25 +8497,15 @@ impl<'a, C> ProjectInstanceTableCheckConsistencyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8699,13 +8513,15 @@ impl<'a, C> ProjectInstanceTableCheckConsistencyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8970,25 +8786,15 @@ impl<'a, C> ProjectInstanceTableCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8996,13 +8802,15 @@ impl<'a, C> ProjectInstanceTableCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9246,25 +9054,15 @@ impl<'a, C> ProjectInstanceTableDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9272,13 +9070,15 @@ impl<'a, C> ProjectInstanceTableDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9534,25 +9334,15 @@ impl<'a, C> ProjectInstanceTableDropRowRangeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9560,13 +9350,15 @@ impl<'a, C> ProjectInstanceTableDropRowRangeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9831,25 +9623,15 @@ impl<'a, C> ProjectInstanceTableGenerateConsistencyTokenCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9857,13 +9639,15 @@ impl<'a, C> ProjectInstanceTableGenerateConsistencyTokenCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10112,25 +9896,15 @@ impl<'a, C> ProjectInstanceTableGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10138,13 +9912,15 @@ impl<'a, C> ProjectInstanceTableGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10407,25 +10183,15 @@ impl<'a, C> ProjectInstanceTableGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10433,13 +10199,15 @@ impl<'a, C> ProjectInstanceTableGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10698,25 +10466,15 @@ impl<'a, C> ProjectInstanceTableListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10724,13 +10482,15 @@ impl<'a, C> ProjectInstanceTableListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11007,25 +10767,15 @@ impl<'a, C> ProjectInstanceTableModifyColumnFamilyCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11033,13 +10783,15 @@ impl<'a, C> ProjectInstanceTableModifyColumnFamilyCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11304,25 +11056,15 @@ impl<'a, C> ProjectInstanceTableRestoreCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11330,13 +11072,15 @@ impl<'a, C> ProjectInstanceTableRestoreCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11601,25 +11345,15 @@ impl<'a, C> ProjectInstanceTableSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11627,13 +11361,15 @@ impl<'a, C> ProjectInstanceTableSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11898,25 +11634,15 @@ impl<'a, C> ProjectInstanceTableTestIamPermissionCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11924,13 +11650,15 @@ impl<'a, C> ProjectInstanceTableTestIamPermissionCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12195,25 +11923,15 @@ impl<'a, C> ProjectInstanceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12221,13 +11939,15 @@ impl<'a, C> ProjectInstanceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12471,25 +12191,15 @@ impl<'a, C> ProjectInstanceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12497,13 +12207,15 @@ impl<'a, C> ProjectInstanceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12738,25 +12450,15 @@ impl<'a, C> ProjectInstanceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12764,13 +12466,15 @@ impl<'a, C> ProjectInstanceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13026,25 +12730,15 @@ impl<'a, C> ProjectInstanceGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13052,13 +12746,15 @@ impl<'a, C> ProjectInstanceGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13307,25 +13003,15 @@ impl<'a, C> ProjectInstanceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13333,13 +13019,15 @@ impl<'a, C> ProjectInstanceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13607,25 +13295,15 @@ impl<'a, C> ProjectInstancePartialUpdateInstanceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13633,13 +13311,15 @@ impl<'a, C> ProjectInstancePartialUpdateInstanceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13911,25 +13591,15 @@ impl<'a, C> ProjectInstanceSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13937,13 +13607,15 @@ impl<'a, C> ProjectInstanceSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14208,25 +13880,15 @@ impl<'a, C> ProjectInstanceTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14234,13 +13896,15 @@ impl<'a, C> ProjectInstanceTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14505,25 +14169,15 @@ impl<'a, C> ProjectInstanceUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14531,13 +14185,15 @@ impl<'a, C> ProjectInstanceUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14781,25 +14437,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14807,13 +14453,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15063,25 +14711,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15089,13 +14727,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/bigtableadmin2/src/client.rs b/gen/bigtableadmin2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/bigtableadmin2/src/client.rs +++ b/gen/bigtableadmin2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/billingbudgets1/src/api.rs b/gen/billingbudgets1/src/api.rs index 3f3b7522f7..fc26481776 100644 --- a/gen/billingbudgets1/src/api.rs +++ b/gen/billingbudgets1/src/api.rs @@ -702,25 +702,15 @@ impl<'a, C> BillingAccountBudgetCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -728,13 +718,15 @@ impl<'a, C> BillingAccountBudgetCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -978,25 +970,15 @@ impl<'a, C> BillingAccountBudgetDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1004,13 +986,15 @@ impl<'a, C> BillingAccountBudgetDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1245,25 +1229,15 @@ impl<'a, C> BillingAccountBudgetGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1271,13 +1245,15 @@ impl<'a, C> BillingAccountBudgetGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1522,25 +1498,15 @@ impl<'a, C> BillingAccountBudgetListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1548,13 +1514,15 @@ impl<'a, C> BillingAccountBudgetListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1829,25 +1797,15 @@ impl<'a, C> BillingAccountBudgetPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1855,13 +1813,15 @@ impl<'a, C> BillingAccountBudgetPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/billingbudgets1/src/client.rs b/gen/billingbudgets1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/billingbudgets1/src/client.rs +++ b/gen/billingbudgets1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/billingbudgets1_beta1-cli/src/main.rs b/gen/billingbudgets1_beta1-cli/src/main.rs index 68e16c0386..31245c0c29 100644 --- a/gen/billingbudgets1_beta1-cli/src/main.rs +++ b/gen/billingbudgets1_beta1-cli/src/main.rs @@ -277,7 +277,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/billingbudgets1_beta1/src/api.rs b/gen/billingbudgets1_beta1/src/api.rs index 3d620d1048..f8cc0563c2 100644 --- a/gen/billingbudgets1_beta1/src/api.rs +++ b/gen/billingbudgets1_beta1/src/api.rs @@ -738,25 +738,15 @@ impl<'a, C> BillingAccountBudgetCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -764,13 +754,15 @@ impl<'a, C> BillingAccountBudgetCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1014,25 +1006,15 @@ impl<'a, C> BillingAccountBudgetDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1040,13 +1022,15 @@ impl<'a, C> BillingAccountBudgetDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1281,25 +1265,15 @@ impl<'a, C> BillingAccountBudgetGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1307,13 +1281,15 @@ impl<'a, C> BillingAccountBudgetGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1558,25 +1534,15 @@ impl<'a, C> BillingAccountBudgetListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1584,13 +1550,15 @@ impl<'a, C> BillingAccountBudgetListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1860,25 +1828,15 @@ impl<'a, C> BillingAccountBudgetPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1886,13 +1844,15 @@ impl<'a, C> BillingAccountBudgetPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/billingbudgets1_beta1/src/client.rs b/gen/billingbudgets1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/billingbudgets1_beta1/src/client.rs +++ b/gen/billingbudgets1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/binaryauthorization1-cli/src/main.rs b/gen/binaryauthorization1-cli/src/main.rs index 74cf93114e..d65829dadd 100644 --- a/gen/binaryauthorization1-cli/src/main.rs +++ b/gen/binaryauthorization1-cli/src/main.rs @@ -320,7 +320,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/binaryauthorization1/src/api.rs b/gen/binaryauthorization1/src/api.rs index 70ca0a0291..0b37e8d19b 100644 --- a/gen/binaryauthorization1/src/api.rs +++ b/gen/binaryauthorization1/src/api.rs @@ -1119,25 +1119,15 @@ impl<'a, C> ProjectAttestorCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1145,13 +1135,15 @@ impl<'a, C> ProjectAttestorCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1402,25 +1394,15 @@ impl<'a, C> ProjectAttestorDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1428,13 +1410,15 @@ impl<'a, C> ProjectAttestorDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1669,25 +1653,15 @@ impl<'a, C> ProjectAttestorGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1695,13 +1669,15 @@ impl<'a, C> ProjectAttestorGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1941,25 +1917,15 @@ impl<'a, C> ProjectAttestorGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1967,13 +1933,15 @@ impl<'a, C> ProjectAttestorGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2225,25 +2193,15 @@ impl<'a, C> ProjectAttestorListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2251,13 +2209,15 @@ impl<'a, C> ProjectAttestorListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2527,25 +2487,15 @@ impl<'a, C> ProjectAttestorSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2553,13 +2503,15 @@ impl<'a, C> ProjectAttestorSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2824,25 +2776,15 @@ impl<'a, C> ProjectAttestorTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2850,13 +2792,15 @@ impl<'a, C> ProjectAttestorTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3121,25 +3065,15 @@ impl<'a, C> ProjectAttestorUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3147,13 +3081,15 @@ impl<'a, C> ProjectAttestorUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3418,25 +3354,15 @@ impl<'a, C> ProjectAttestorValidateAttestationOccurrenceCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3444,13 +3370,15 @@ impl<'a, C> ProjectAttestorValidateAttestationOccurrenceCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3699,25 +3627,15 @@ impl<'a, C> ProjectPolicyGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3725,13 +3643,15 @@ impl<'a, C> ProjectPolicyGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3994,25 +3914,15 @@ impl<'a, C> ProjectPolicySetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4020,13 +3930,15 @@ impl<'a, C> ProjectPolicySetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4291,25 +4203,15 @@ impl<'a, C> ProjectPolicyTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4317,13 +4219,15 @@ impl<'a, C> ProjectPolicyTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4567,25 +4471,15 @@ impl<'a, C> ProjectGetPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4593,13 +4487,15 @@ impl<'a, C> ProjectGetPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4855,25 +4751,15 @@ impl<'a, C> ProjectUpdatePolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4881,13 +4767,15 @@ impl<'a, C> ProjectUpdatePolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5131,25 +5019,15 @@ impl<'a, C> SystempolicyGetPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5157,13 +5035,15 @@ impl<'a, C> SystempolicyGetPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/binaryauthorization1/src/client.rs b/gen/binaryauthorization1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/binaryauthorization1/src/client.rs +++ b/gen/binaryauthorization1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/binaryauthorization1_beta1-cli/src/main.rs b/gen/binaryauthorization1_beta1-cli/src/main.rs index f4b3e490e8..e6de21ebed 100644 --- a/gen/binaryauthorization1_beta1-cli/src/main.rs +++ b/gen/binaryauthorization1_beta1-cli/src/main.rs @@ -320,7 +320,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/binaryauthorization1_beta1/src/api.rs b/gen/binaryauthorization1_beta1/src/api.rs index e7932c0e3e..8f1fc03e17 100644 --- a/gen/binaryauthorization1_beta1/src/api.rs +++ b/gen/binaryauthorization1_beta1/src/api.rs @@ -1119,25 +1119,15 @@ impl<'a, C> ProjectAttestorCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1145,13 +1135,15 @@ impl<'a, C> ProjectAttestorCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1402,25 +1394,15 @@ impl<'a, C> ProjectAttestorDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1428,13 +1410,15 @@ impl<'a, C> ProjectAttestorDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1669,25 +1653,15 @@ impl<'a, C> ProjectAttestorGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1695,13 +1669,15 @@ impl<'a, C> ProjectAttestorGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1941,25 +1917,15 @@ impl<'a, C> ProjectAttestorGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1967,13 +1933,15 @@ impl<'a, C> ProjectAttestorGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2225,25 +2193,15 @@ impl<'a, C> ProjectAttestorListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2251,13 +2209,15 @@ impl<'a, C> ProjectAttestorListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2527,25 +2487,15 @@ impl<'a, C> ProjectAttestorSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2553,13 +2503,15 @@ impl<'a, C> ProjectAttestorSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2824,25 +2776,15 @@ impl<'a, C> ProjectAttestorTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2850,13 +2792,15 @@ impl<'a, C> ProjectAttestorTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3121,25 +3065,15 @@ impl<'a, C> ProjectAttestorUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3147,13 +3081,15 @@ impl<'a, C> ProjectAttestorUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3418,25 +3354,15 @@ impl<'a, C> ProjectAttestorValidateAttestationOccurrenceCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3444,13 +3370,15 @@ impl<'a, C> ProjectAttestorValidateAttestationOccurrenceCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3699,25 +3627,15 @@ impl<'a, C> ProjectPolicyGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3725,13 +3643,15 @@ impl<'a, C> ProjectPolicyGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3994,25 +3914,15 @@ impl<'a, C> ProjectPolicySetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4020,13 +3930,15 @@ impl<'a, C> ProjectPolicySetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4291,25 +4203,15 @@ impl<'a, C> ProjectPolicyTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4317,13 +4219,15 @@ impl<'a, C> ProjectPolicyTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4567,25 +4471,15 @@ impl<'a, C> ProjectGetPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4593,13 +4487,15 @@ impl<'a, C> ProjectGetPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4855,25 +4751,15 @@ impl<'a, C> ProjectUpdatePolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4881,13 +4767,15 @@ impl<'a, C> ProjectUpdatePolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5131,25 +5019,15 @@ impl<'a, C> SystempolicyGetPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5157,13 +5035,15 @@ impl<'a, C> SystempolicyGetPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/binaryauthorization1_beta1/src/client.rs b/gen/binaryauthorization1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/binaryauthorization1_beta1/src/client.rs +++ b/gen/binaryauthorization1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/blogger3-cli/src/main.rs b/gen/blogger3-cli/src/main.rs index 9b98b104c0..ef1b746020 100644 --- a/gen/blogger3-cli/src/main.rs +++ b/gen/blogger3-cli/src/main.rs @@ -244,7 +244,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["status", "role", "view", "fetch-user-info"].iter().map(|v|*v)); + v.extend(["fetch-user-info", "role", "status", "view"].iter().map(|v|*v)); v } )); } } @@ -470,7 +470,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-date", "page-token", "max-results", "end-date", "view", "status", "fetch-bodies"].iter().map(|v|*v)); + v.extend(["end-date", "fetch-bodies", "max-results", "page-token", "start-date", "status", "view"].iter().map(|v|*v)); v } )); } } @@ -541,7 +541,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-date", "page-token", "max-results", "end-date", "status", "fetch-bodies"].iter().map(|v|*v)); + v.extend(["end-date", "fetch-bodies", "max-results", "page-token", "start-date", "status"].iter().map(|v|*v)); v } )); } } @@ -972,7 +972,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results", "view", "status", "fetch-bodies"].iter().map(|v|*v)); + v.extend(["fetch-bodies", "max-results", "page-token", "status", "view"].iter().map(|v|*v)); v } )); } } @@ -1078,7 +1078,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["revert", "publish"].iter().map(|v|*v)); + v.extend(["publish", "revert"].iter().map(|v|*v)); v } )); } } @@ -1288,7 +1288,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["revert", "publish"].iter().map(|v|*v)); + v.extend(["publish", "revert"].iter().map(|v|*v)); v } )); } } @@ -1424,7 +1424,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-date", "page-token", "labels", "max-results", "order-by", "end-date", "view", "status", "fetch-bodies"].iter().map(|v|*v)); + v.extend(["end-date", "fetch-bodies", "labels", "max-results", "order-by", "page-token", "start-date", "status", "view"].iter().map(|v|*v)); v } )); } } @@ -1533,7 +1533,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-comments", "fetch-images", "view", "fetch-body"].iter().map(|v|*v)); + v.extend(["fetch-body", "fetch-images", "max-comments", "view"].iter().map(|v|*v)); v } )); } } @@ -1711,7 +1711,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["fetch-images", "is-draft", "fetch-body"].iter().map(|v|*v)); + v.extend(["fetch-body", "fetch-images", "is-draft"].iter().map(|v|*v)); v } )); } } @@ -1794,7 +1794,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-date", "page-token", "labels", "fetch-images", "max-results", "order-by", "end-date", "view", "status", "fetch-bodies"].iter().map(|v|*v)); + v.extend(["end-date", "fetch-bodies", "fetch-images", "labels", "max-results", "order-by", "page-token", "start-date", "status", "view"].iter().map(|v|*v)); v } )); } } @@ -1919,7 +1919,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-comments", "fetch-images", "publish", "revert", "fetch-body"].iter().map(|v|*v)); + v.extend(["fetch-body", "fetch-images", "max-comments", "publish", "revert"].iter().map(|v|*v)); v } )); } } @@ -2086,7 +2086,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["order-by", "fetch-bodies"].iter().map(|v|*v)); + v.extend(["fetch-bodies", "order-by"].iter().map(|v|*v)); v } )); } } @@ -2211,7 +2211,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-comments", "fetch-images", "publish", "revert", "fetch-body"].iter().map(|v|*v)); + v.extend(["fetch-body", "fetch-images", "max-comments", "publish", "revert"].iter().map(|v|*v)); v } )); } } diff --git a/gen/blogger3/src/api.rs b/gen/blogger3/src/api.rs index e2e4462523..41a18db34d 100644 --- a/gen/blogger3/src/api.rs +++ b/gen/blogger3/src/api.rs @@ -2237,25 +2237,15 @@ impl<'a, C> BlogUserInfoGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2263,13 +2253,15 @@ impl<'a, C> BlogUserInfoGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2524,25 +2516,15 @@ impl<'a, C> BlogGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2550,13 +2532,15 @@ impl<'a, C> BlogGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2782,25 +2766,15 @@ impl<'a, C> BlogGetByUrlCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2808,13 +2782,15 @@ impl<'a, C> BlogGetByUrlCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3074,25 +3050,15 @@ impl<'a, C> BlogListByUserCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3100,13 +3066,15 @@ impl<'a, C> BlogListByUserCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3367,25 +3335,15 @@ impl<'a, C> CommentApproveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3393,13 +3351,15 @@ impl<'a, C> CommentApproveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3650,25 +3610,15 @@ impl<'a, C> CommentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3676,11 +3626,11 @@ impl<'a, C> CommentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -3931,25 +3881,15 @@ impl<'a, C> CommentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3957,13 +3897,15 @@ impl<'a, C> CommentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4254,25 +4196,15 @@ impl<'a, C> CommentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4280,13 +4212,15 @@ impl<'a, C> CommentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4599,25 +4533,15 @@ impl<'a, C> CommentListByBlogCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4625,13 +4549,15 @@ impl<'a, C> CommentListByBlogCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4902,25 +4828,15 @@ impl<'a, C> CommentMarkAsSpamCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4928,13 +4844,15 @@ impl<'a, C> CommentMarkAsSpamCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5186,25 +5104,15 @@ impl<'a, C> CommentRemoveContentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5212,13 +5120,15 @@ impl<'a, C> CommentRemoveContentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5473,25 +5383,15 @@ impl<'a, C> PageViewGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5499,13 +5399,15 @@ impl<'a, C> PageViewGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5743,25 +5645,15 @@ impl<'a, C> PageDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5769,11 +5661,11 @@ impl<'a, C> PageDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -6013,25 +5905,15 @@ impl<'a, C> PageGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6039,13 +5921,15 @@ impl<'a, C> PageGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6316,25 +6200,15 @@ impl<'a, C> PageInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6342,13 +6216,15 @@ impl<'a, C> PageInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6620,25 +6496,15 @@ impl<'a, C> PageListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6646,13 +6512,15 @@ impl<'a, C> PageListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6946,25 +6814,15 @@ impl<'a, C> PagePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6972,13 +6830,15 @@ impl<'a, C> PagePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7240,25 +7100,15 @@ impl<'a, C> PagePublishCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7266,13 +7116,15 @@ impl<'a, C> PagePublishCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7513,25 +7365,15 @@ impl<'a, C> PageRevertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7539,13 +7381,15 @@ impl<'a, C> PageRevertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7817,25 +7661,15 @@ impl<'a, C> PageUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7843,13 +7677,15 @@ impl<'a, C> PageUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8118,25 +7954,15 @@ impl<'a, C> PostUserInfoGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8144,13 +7970,15 @@ impl<'a, C> PostUserInfoGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8453,25 +8281,15 @@ impl<'a, C> PostUserInfoListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8479,13 +8297,15 @@ impl<'a, C> PostUserInfoListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8780,25 +8600,15 @@ impl<'a, C> PostDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8806,11 +8616,11 @@ impl<'a, C> PostDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -9065,25 +8875,15 @@ impl<'a, C> PostGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9091,13 +8891,15 @@ impl<'a, C> PostGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9372,25 +9174,15 @@ impl<'a, C> PostGetByPathCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9398,13 +9190,15 @@ impl<'a, C> PostGetByPathCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9691,25 +9485,15 @@ impl<'a, C> PostInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9717,13 +9501,15 @@ impl<'a, C> PostInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10032,25 +9818,15 @@ impl<'a, C> PostListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10058,13 +9834,15 @@ impl<'a, C> PostListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10403,25 +10181,15 @@ impl<'a, C> PostPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10429,13 +10197,15 @@ impl<'a, C> PostPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10720,25 +10490,15 @@ impl<'a, C> PostPublishCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10746,13 +10506,15 @@ impl<'a, C> PostPublishCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10999,25 +10761,15 @@ impl<'a, C> PostRevertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11025,13 +10777,15 @@ impl<'a, C> PostRevertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11282,25 +11036,15 @@ impl<'a, C> PostSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11308,13 +11052,15 @@ impl<'a, C> PostSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11613,25 +11359,15 @@ impl<'a, C> PostUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11639,13 +11375,15 @@ impl<'a, C> PostUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11923,25 +11661,15 @@ impl<'a, C> UserGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11949,13 +11677,15 @@ impl<'a, C> UserGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/blogger3/src/client.rs b/gen/blogger3/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/blogger3/src/client.rs +++ b/gen/blogger3/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/books1-cli/src/main.rs b/gen/books1-cli/src/main.rs index 15cc68d0a7..06fa04e52d 100644 --- a/gen/books1-cli/src/main.rs +++ b/gen/books1-cli/src/main.rs @@ -185,7 +185,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["show-preorders", "max-results", "source", "start-index"].iter().map(|v|*v)); + v.extend(["max-results", "show-preorders", "source", "start-index"].iter().map(|v|*v)); v } )); } } @@ -250,7 +250,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["name", "mime-type", "upload-client-token", "drive-document-id"].iter().map(|v|*v)); + v.extend(["drive-document-id", "mime-type", "name", "upload-client-token"].iter().map(|v|*v)); v } )); } } @@ -560,7 +560,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["source", "doc-id", "volume-id"].iter().map(|v|*v)); + v.extend(["doc-id", "source", "volume-id"].iter().map(|v|*v)); v } )); } } @@ -622,7 +622,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["source", "doc-id", "volume-id"].iter().map(|v|*v)); + v.extend(["doc-id", "source", "volume-id"].iter().map(|v|*v)); v } )); } } @@ -693,7 +693,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["source", "locale", "allow-web-definitions", "scale", "h", "w"].iter().map(|v|*v)); + v.extend(["allow-web-definitions", "h", "locale", "scale", "source", "w"].iter().map(|v|*v)); v } )); } } @@ -776,7 +776,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["updated-max", "source", "page-token", "locale", "max-results", "scale", "h", "updated-min", "w", "annotation-data-id"].iter().map(|v|*v)); + v.extend(["annotation-data-id", "h", "locale", "max-results", "page-token", "scale", "source", "updated-max", "updated-min", "w"].iter().map(|v|*v)); v } )); } } @@ -900,7 +900,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["content-version", "page-token", "max-results", "source"].iter().map(|v|*v)); + v.extend(["content-version", "max-results", "page-token", "source"].iter().map(|v|*v)); v } )); } } @@ -1048,7 +1048,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["updated-max", "start-position", "source", "volume-annotations-version", "page-token", "locale", "start-offset", "max-results", "end-offset", "updated-min", "show-deleted", "end-position"].iter().map(|v|*v)); + v.extend(["end-offset", "end-position", "locale", "max-results", "page-token", "show-deleted", "source", "start-offset", "start-position", "updated-max", "updated-min", "volume-annotations-version"].iter().map(|v|*v)); v } )); } } @@ -1290,7 +1290,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["volume-ids", "show-preorders", "locale", "features", "include-non-comics-series"].iter().map(|v|*v)); + v.extend(["features", "include-non-comics-series", "locale", "show-preorders", "volume-ids"].iter().map(|v|*v)); v } )); } } @@ -1586,7 +1586,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["annotation-id", "show-only-summary-in-response", "source", "country"].iter().map(|v|*v)); + v.extend(["annotation-id", "country", "show-only-summary-in-response", "source"].iter().map(|v|*v)); v } )); } } @@ -1669,7 +1669,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["updated-max", "content-version", "source", "layer-ids", "layer-id", "page-token", "volume-id", "max-results", "updated-min", "show-deleted"].iter().map(|v|*v)); + v.extend(["content-version", "layer-id", "layer-ids", "max-results", "page-token", "show-deleted", "source", "updated-max", "updated-min", "volume-id"].iter().map(|v|*v)); v } )); } } @@ -2277,7 +2277,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["source", "q", "start-index", "country", "show-preorders", "max-results", "projection"].iter().map(|v|*v)); + v.extend(["country", "max-results", "projection", "q", "show-preorders", "source", "start-index"].iter().map(|v|*v)); v } )); } } @@ -2401,7 +2401,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["content-version", "action", "device-cookie", "source"].iter().map(|v|*v)); + v.extend(["action", "content-version", "device-cookie", "source"].iter().map(|v|*v)); v } )); } } @@ -2584,7 +2584,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "locale", "max-allowed-maturity-rating", "category-id"].iter().map(|v|*v)); + v.extend(["category-id", "locale", "max-allowed-maturity-rating", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2646,7 +2646,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-allowed-maturity-rating", "locale", "source"].iter().map(|v|*v)); + v.extend(["locale", "max-allowed-maturity-rating", "source"].iter().map(|v|*v)); v } )); } } @@ -2723,7 +2723,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["model", "serial", "volume-id", "manufacturer", "product", "offer-id", "device", "android-id"].iter().map(|v|*v)); + v.extend(["android-id", "device", "manufacturer", "model", "offer-id", "product", "serial", "volume-id"].iter().map(|v|*v)); v } )); } } @@ -2797,7 +2797,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["model", "serial", "manufacturer", "product", "offer-id", "device", "android-id"].iter().map(|v|*v)); + v.extend(["android-id", "device", "manufacturer", "model", "offer-id", "product", "serial"].iter().map(|v|*v)); v } )); } } @@ -2868,7 +2868,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["model", "serial", "manufacturer", "product", "device", "android-id"].iter().map(|v|*v)); + v.extend(["android-id", "device", "manufacturer", "model", "product", "serial"].iter().map(|v|*v)); v } )); } } @@ -2979,7 +2979,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3044,7 +3044,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-allowed-maturity-rating", "locale", "association", "source"].iter().map(|v|*v)); + v.extend(["association", "locale", "max-allowed-maturity-rating", "source"].iter().map(|v|*v)); v } )); } } @@ -3115,7 +3115,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["source", "country", "include-non-comics-series", "partner", "user-library-consistent-read", "projection"].iter().map(|v|*v)); + v.extend(["country", "include-non-comics-series", "partner", "projection", "source", "user-library-consistent-read"].iter().map(|v|*v)); v } )); } } @@ -3207,7 +3207,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "source", "lang-restrict", "start-index", "show-preorders", "order-by", "download", "print-type", "partner", "max-results", "library-restrict", "max-allowed-maturity-rating", "projection"].iter().map(|v|*v)); + v.extend(["download", "filter", "lang-restrict", "library-restrict", "max-allowed-maturity-rating", "max-results", "order-by", "partner", "print-type", "projection", "show-preorders", "source", "start-index"].iter().map(|v|*v)); v } )); } } @@ -3281,7 +3281,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["acquire-method", "source", "start-index", "country", "locale", "processing-state", "max-results"].iter().map(|v|*v)); + v.extend(["acquire-method", "country", "locale", "max-results", "processing-state", "source", "start-index"].iter().map(|v|*v)); v } )); } } @@ -3343,7 +3343,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-allowed-maturity-rating", "locale", "source"].iter().map(|v|*v)); + v.extend(["locale", "max-allowed-maturity-rating", "source"].iter().map(|v|*v)); v } )); } } @@ -3473,7 +3473,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["source", "start-index", "locale", "volume-id", "processing-state", "max-results"].iter().map(|v|*v)); + v.extend(["locale", "max-results", "processing-state", "source", "start-index", "volume-id"].iter().map(|v|*v)); v } )); } } diff --git a/gen/books1/src/api.rs b/gen/books1/src/api.rs index 941dab681e..d4c03a5f92 100644 --- a/gen/books1/src/api.rs +++ b/gen/books1/src/api.rs @@ -4669,25 +4669,15 @@ impl<'a, C> BookshelveVolumeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4695,13 +4685,15 @@ impl<'a, C> BookshelveVolumeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4977,25 +4969,15 @@ impl<'a, C> BookshelveGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5003,13 +4985,15 @@ impl<'a, C> BookshelveGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5262,25 +5246,15 @@ impl<'a, C> BookshelveListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5288,13 +5262,15 @@ impl<'a, C> BookshelveListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5529,25 +5505,15 @@ impl<'a, C> CloudloadingAddBookCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5555,13 +5521,15 @@ impl<'a, C> CloudloadingAddBookCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5789,25 +5757,15 @@ impl<'a, C> CloudloadingDeleteBookCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5815,13 +5773,15 @@ impl<'a, C> CloudloadingDeleteBookCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6050,25 +6010,15 @@ impl<'a, C> CloudloadingUpdateBookCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6076,13 +6026,15 @@ impl<'a, C> CloudloadingUpdateBookCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6291,25 +6243,15 @@ impl<'a, C> DictionaryListOfflineMetadataCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6317,13 +6259,15 @@ impl<'a, C> DictionaryListOfflineMetadataCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6536,25 +6480,15 @@ impl<'a, C> FamilysharingGetFamilyInfoCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6562,13 +6496,15 @@ impl<'a, C> FamilysharingGetFamilyInfoCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6788,25 +6724,15 @@ impl<'a, C> FamilysharingShareCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6814,13 +6740,15 @@ impl<'a, C> FamilysharingShareCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7054,25 +6982,15 @@ impl<'a, C> FamilysharingUnshareCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7080,13 +6998,15 @@ impl<'a, C> FamilysharingUnshareCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7364,25 +7284,15 @@ impl<'a, C> LayerAnnotationDataGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7390,13 +7300,15 @@ impl<'a, C> LayerAnnotationDataGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7755,25 +7667,15 @@ impl<'a, C> LayerAnnotationDataListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7781,13 +7683,15 @@ impl<'a, C> LayerAnnotationDataListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8123,25 +8027,15 @@ impl<'a, C> LayerVolumeAnnotationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8149,13 +8043,15 @@ impl<'a, C> LayerVolumeAnnotationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8484,25 +8380,15 @@ impl<'a, C> LayerVolumeAnnotationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8510,13 +8396,15 @@ impl<'a, C> LayerVolumeAnnotationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8863,25 +8751,15 @@ impl<'a, C> LayerGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8889,13 +8767,15 @@ impl<'a, C> LayerGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9170,25 +9050,15 @@ impl<'a, C> LayerListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9196,13 +9066,15 @@ impl<'a, C> LayerListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9443,25 +9315,15 @@ impl<'a, C> MyconfigGetUserSettingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9469,13 +9331,15 @@ impl<'a, C> MyconfigGetUserSettingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9698,25 +9562,15 @@ impl<'a, C> MyconfigReleaseDownloadAccesCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9724,13 +9578,15 @@ impl<'a, C> MyconfigReleaseDownloadAccesCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9981,25 +9837,15 @@ impl<'a, C> MyconfigRequestAccesCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10007,13 +9853,15 @@ impl<'a, C> MyconfigRequestAccesCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10300,25 +10148,15 @@ impl<'a, C> MyconfigSyncVolumeLicenseCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10326,13 +10164,15 @@ impl<'a, C> MyconfigSyncVolumeLicenseCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10618,25 +10458,15 @@ impl<'a, C> MyconfigUpdateUserSettingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10644,13 +10474,15 @@ impl<'a, C> MyconfigUpdateUserSettingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10885,25 +10717,15 @@ impl<'a, C> MylibraryAnnotationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10911,13 +10733,15 @@ impl<'a, C> MylibraryAnnotationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11173,25 +10997,15 @@ impl<'a, C> MylibraryAnnotationInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11199,13 +11013,15 @@ impl<'a, C> MylibraryAnnotationInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11492,25 +11308,15 @@ impl<'a, C> MylibraryAnnotationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11518,13 +11324,15 @@ impl<'a, C> MylibraryAnnotationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11801,25 +11609,15 @@ impl<'a, C> MylibraryAnnotationSummaryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11827,13 +11625,15 @@ impl<'a, C> MylibraryAnnotationSummaryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12101,25 +11901,15 @@ impl<'a, C> MylibraryAnnotationUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12127,13 +11917,15 @@ impl<'a, C> MylibraryAnnotationUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12415,25 +12207,15 @@ impl<'a, C> MylibraryBookshelveVolumeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12441,13 +12223,15 @@ impl<'a, C> MylibraryBookshelveVolumeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12739,25 +12523,15 @@ impl<'a, C> MylibraryBookshelveAddVolumeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12765,13 +12539,15 @@ impl<'a, C> MylibraryBookshelveAddVolumeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13031,25 +12807,15 @@ impl<'a, C> MylibraryBookshelveClearVolumeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13057,13 +12823,15 @@ impl<'a, C> MylibraryBookshelveClearVolumeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13306,25 +13074,15 @@ impl<'a, C> MylibraryBookshelveGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13332,13 +13090,15 @@ impl<'a, C> MylibraryBookshelveGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13558,25 +13318,15 @@ impl<'a, C> MylibraryBookshelveListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13584,13 +13334,15 @@ impl<'a, C> MylibraryBookshelveListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13827,25 +13579,15 @@ impl<'a, C> MylibraryBookshelveMoveVolumeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13853,13 +13595,15 @@ impl<'a, C> MylibraryBookshelveMoveVolumeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14129,25 +13873,15 @@ impl<'a, C> MylibraryBookshelveRemoveVolumeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14155,13 +13889,15 @@ impl<'a, C> MylibraryBookshelveRemoveVolumeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14426,25 +14162,15 @@ impl<'a, C> MylibraryReadingpositionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14452,13 +14178,15 @@ impl<'a, C> MylibraryReadingpositionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14727,25 +14455,15 @@ impl<'a, C> MylibraryReadingpositionSetPositionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14753,13 +14471,15 @@ impl<'a, C> MylibraryReadingpositionSetPositionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15027,25 +14747,15 @@ impl<'a, C> NotificationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15053,13 +14763,15 @@ impl<'a, C> NotificationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15286,25 +14998,15 @@ impl<'a, C> OnboardingListCategoryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15312,13 +15014,15 @@ impl<'a, C> OnboardingListCategoryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15550,25 +15254,15 @@ impl<'a, C> OnboardingListCategoryVolumeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15576,13 +15270,15 @@ impl<'a, C> OnboardingListCategoryVolumeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15831,25 +15527,15 @@ impl<'a, C> PersonalizedstreamGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15857,13 +15543,15 @@ impl<'a, C> PersonalizedstreamGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16122,25 +15810,15 @@ impl<'a, C> PromoofferAcceptCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16148,13 +15826,15 @@ impl<'a, C> PromoofferAcceptCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16442,25 +16122,15 @@ impl<'a, C> PromoofferDismisCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16468,13 +16138,15 @@ impl<'a, C> PromoofferDismisCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16751,25 +16423,15 @@ impl<'a, C> PromoofferGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16777,13 +16439,15 @@ impl<'a, C> PromoofferGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17035,25 +16699,15 @@ impl<'a, C> SeryMembershipGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17061,13 +16715,15 @@ impl<'a, C> SeryMembershipGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17295,25 +16951,15 @@ impl<'a, C> SeryGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17321,13 +16967,15 @@ impl<'a, C> SeryGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17579,25 +17227,15 @@ impl<'a, C> VolumeAssociatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17605,13 +17243,15 @@ impl<'a, C> VolumeAssociatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17886,25 +17526,15 @@ impl<'a, C> VolumeMybookListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17912,13 +17542,15 @@ impl<'a, C> VolumeMybookListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18182,25 +17814,15 @@ impl<'a, C> VolumeRecommendedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18208,13 +17830,15 @@ impl<'a, C> VolumeRecommendedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18447,25 +18071,15 @@ impl<'a, C> VolumeRecommendedRateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18473,13 +18087,15 @@ impl<'a, C> VolumeRecommendedRateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18745,25 +18361,15 @@ impl<'a, C> VolumeUseruploadedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18771,13 +18377,15 @@ impl<'a, C> VolumeUseruploadedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19072,25 +18680,15 @@ impl<'a, C> VolumeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19098,13 +18696,15 @@ impl<'a, C> VolumeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19420,25 +19020,15 @@ impl<'a, C> VolumeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19446,13 +19036,15 @@ impl<'a, C> VolumeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/books1/src/client.rs b/gen/books1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/books1/src/client.rs +++ b/gen/books1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/calendar3-cli/src/main.rs b/gen/calendar3-cli/src/main.rs index b36ae508f7..5c15c9efcc 100644 --- a/gen/calendar3-cli/src/main.rs +++ b/gen/calendar3-cli/src/main.rs @@ -263,7 +263,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "show-deleted", "sync-token", "page-token"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "show-deleted", "sync-token"].iter().map(|v|*v)); v } )); } } @@ -558,7 +558,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "show-deleted", "sync-token", "page-token"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "show-deleted", "sync-token"].iter().map(|v|*v)); v } )); } } @@ -830,7 +830,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["show-hidden", "show-deleted", "sync-token", "max-results", "min-access-role", "page-token"].iter().map(|v|*v)); + v.extend(["max-results", "min-access-role", "page-token", "show-deleted", "show-hidden", "sync-token"].iter().map(|v|*v)); v } )); } } @@ -1153,7 +1153,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["show-hidden", "show-deleted", "sync-token", "max-results", "min-access-role", "page-token"].iter().map(|v|*v)); + v.extend(["max-results", "min-access-role", "page-token", "show-deleted", "show-hidden", "sync-token"].iter().map(|v|*v)); v } )); } } @@ -1820,7 +1820,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-attendees", "time-zone", "always-include-email"].iter().map(|v|*v)); + v.extend(["always-include-email", "max-attendees", "time-zone"].iter().map(|v|*v)); v } )); } } @@ -2145,7 +2145,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["send-updates", "supports-attachments", "max-attendees", "send-notifications", "conference-data-version"].iter().map(|v|*v)); + v.extend(["conference-data-version", "max-attendees", "send-notifications", "send-updates", "supports-attachments"].iter().map(|v|*v)); v } )); } } @@ -2225,7 +2225,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["original-start", "time-min", "time-max", "show-deleted", "always-include-email", "max-results", "max-attendees", "time-zone", "page-token"].iter().map(|v|*v)); + v.extend(["always-include-email", "max-attendees", "max-results", "original-start", "page-token", "show-deleted", "time-max", "time-min", "time-zone"].iter().map(|v|*v)); v } )); } } @@ -2329,7 +2329,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["single-events", "private-extended-property", "show-hidden-invitations", "time-min", "time-max", "show-deleted", "always-include-email", "sync-token", "max-results", "updated-min", "max-attendees", "order-by", "i-cal-uid", "time-zone", "q", "shared-extended-property", "page-token"].iter().map(|v|*v)); + v.extend(["always-include-email", "i-cal-uid", "max-attendees", "max-results", "order-by", "page-token", "private-extended-property", "q", "shared-extended-property", "show-deleted", "show-hidden-invitations", "single-events", "sync-token", "time-max", "time-min", "time-zone", "updated-min"].iter().map(|v|*v)); v } )); } } @@ -2558,7 +2558,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["send-updates", "supports-attachments", "always-include-email", "max-attendees", "send-notifications", "conference-data-version"].iter().map(|v|*v)); + v.extend(["always-include-email", "conference-data-version", "max-attendees", "send-notifications", "send-updates", "supports-attachments"].iter().map(|v|*v)); v } )); } } @@ -2787,7 +2787,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["send-updates", "supports-attachments", "always-include-email", "max-attendees", "send-notifications", "conference-data-version"].iter().map(|v|*v)); + v.extend(["always-include-email", "conference-data-version", "max-attendees", "send-notifications", "send-updates", "supports-attachments"].iter().map(|v|*v)); v } )); } } @@ -2933,7 +2933,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["single-events", "private-extended-property", "show-hidden-invitations", "time-min", "time-max", "show-deleted", "always-include-email", "sync-token", "max-results", "updated-min", "max-attendees", "order-by", "i-cal-uid", "time-zone", "q", "shared-extended-property", "page-token"].iter().map(|v|*v)); + v.extend(["always-include-email", "i-cal-uid", "max-attendees", "max-results", "order-by", "page-token", "private-extended-property", "q", "shared-extended-property", "show-deleted", "show-hidden-invitations", "single-events", "sync-token", "time-max", "time-min", "time-zone", "updated-min"].iter().map(|v|*v)); v } )); } } @@ -3136,7 +3136,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "sync-token", "page-token"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "sync-token"].iter().map(|v|*v)); v } )); } } @@ -3240,7 +3240,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "sync-token", "page-token"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "sync-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/calendar3/src/api.rs b/gen/calendar3/src/api.rs index 02ab83da8f..09eed6e736 100644 --- a/gen/calendar3/src/api.rs +++ b/gen/calendar3/src/api.rs @@ -2672,25 +2672,15 @@ impl<'a, C> AclDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2698,11 +2688,11 @@ impl<'a, C> AclDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -2935,25 +2925,15 @@ impl<'a, C> AclGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2961,13 +2941,15 @@ impl<'a, C> AclGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3230,25 +3212,15 @@ impl<'a, C> AclInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3256,13 +3228,15 @@ impl<'a, C> AclInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3525,25 +3499,15 @@ impl<'a, C> AclListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3551,13 +3515,15 @@ impl<'a, C> AclListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3843,25 +3809,15 @@ impl<'a, C> AclPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3869,13 +3825,15 @@ impl<'a, C> AclPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4156,25 +4114,15 @@ impl<'a, C> AclUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4182,13 +4130,15 @@ impl<'a, C> AclUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4482,25 +4432,15 @@ impl<'a, C> AclWatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4508,13 +4448,15 @@ impl<'a, C> AclWatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4780,25 +4722,15 @@ impl<'a, C> CalendarListDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4806,11 +4738,11 @@ impl<'a, C> CalendarListDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -5031,25 +4963,15 @@ impl<'a, C> CalendarListGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5057,13 +4979,15 @@ impl<'a, C> CalendarListGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5293,25 +5217,15 @@ impl<'a, C> CalendarListInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5319,13 +5233,15 @@ impl<'a, C> CalendarListInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5565,25 +5481,15 @@ impl<'a, C> CalendarListListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5591,13 +5497,15 @@ impl<'a, C> CalendarListListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5886,25 +5794,15 @@ impl<'a, C> CalendarListPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5912,13 +5810,15 @@ impl<'a, C> CalendarListPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6187,25 +6087,15 @@ impl<'a, C> CalendarListUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6213,13 +6103,15 @@ impl<'a, C> CalendarListUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6490,25 +6382,15 @@ impl<'a, C> CalendarListWatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6516,13 +6398,15 @@ impl<'a, C> CalendarListWatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6793,25 +6677,15 @@ impl<'a, C> CalendarClearCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6819,11 +6693,11 @@ impl<'a, C> CalendarClearCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -7043,25 +6917,15 @@ impl<'a, C> CalendarDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7069,11 +6933,11 @@ impl<'a, C> CalendarDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -7294,25 +7158,15 @@ impl<'a, C> CalendarGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7320,13 +7174,15 @@ impl<'a, C> CalendarGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7551,25 +7407,15 @@ impl<'a, C> CalendarInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7577,13 +7423,15 @@ impl<'a, C> CalendarInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7830,25 +7678,15 @@ impl<'a, C> CalendarPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7856,13 +7694,15 @@ impl<'a, C> CalendarPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8119,25 +7959,15 @@ impl<'a, C> CalendarUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8145,13 +7975,15 @@ impl<'a, C> CalendarUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8384,25 +8216,15 @@ impl<'a, C> ChannelStopCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8410,11 +8232,11 @@ impl<'a, C> ChannelStopCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -8611,25 +8433,15 @@ impl<'a, C> ColorGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8637,13 +8449,15 @@ impl<'a, C> ColorGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8871,25 +8685,15 @@ impl<'a, C> EventDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8897,11 +8701,11 @@ impl<'a, C> EventDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -9165,25 +8969,15 @@ impl<'a, C> EventGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9191,13 +8985,15 @@ impl<'a, C> EventGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9486,25 +9282,15 @@ impl<'a, C> EventImportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9512,13 +9298,15 @@ impl<'a, C> EventImportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9814,25 +9602,15 @@ impl<'a, C> EventInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9840,13 +9618,15 @@ impl<'a, C> EventInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10166,25 +9946,15 @@ impl<'a, C> EventInstanceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10192,13 +9962,15 @@ impl<'a, C> EventInstanceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10587,25 +10359,15 @@ impl<'a, C> EventListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10613,13 +10375,15 @@ impl<'a, C> EventListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10994,25 +10758,15 @@ impl<'a, C> EventMoveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11020,13 +10774,15 @@ impl<'a, C> EventMoveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11342,25 +11098,15 @@ impl<'a, C> EventPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11368,13 +11114,15 @@ impl<'a, C> EventPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11676,25 +11424,15 @@ impl<'a, C> EventQuickAddCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11702,13 +11440,15 @@ impl<'a, C> EventQuickAddCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12014,25 +11754,15 @@ impl<'a, C> EventUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12040,13 +11770,15 @@ impl<'a, C> EventUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12446,25 +12178,15 @@ impl<'a, C> EventWatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12472,13 +12194,15 @@ impl<'a, C> EventWatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12846,25 +12570,15 @@ impl<'a, C> FreebusyQueryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12872,13 +12586,15 @@ impl<'a, C> FreebusyQueryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13104,25 +12820,15 @@ impl<'a, C> SettingGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13130,13 +12836,15 @@ impl<'a, C> SettingGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13355,25 +13063,15 @@ impl<'a, C> SettingListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13381,13 +13079,15 @@ impl<'a, C> SettingListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13641,25 +13341,15 @@ impl<'a, C> SettingWatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13667,13 +13357,15 @@ impl<'a, C> SettingWatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/calendar3/src/client.rs b/gen/calendar3/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/calendar3/src/client.rs +++ b/gen/calendar3/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/chat1/src/api.rs b/gen/chat1/src/api.rs index 8f68ef5845..32eb5e1381 100644 --- a/gen/chat1/src/api.rs +++ b/gen/chat1/src/api.rs @@ -1467,25 +1467,15 @@ impl<'a, C> DmConversationMessageCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1493,13 +1483,15 @@ impl<'a, C> DmConversationMessageCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1745,25 +1737,15 @@ impl<'a, C> DmMessageCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1771,13 +1753,15 @@ impl<'a, C> DmMessageCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2023,25 +2007,15 @@ impl<'a, C> DmWebhookCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2049,13 +2023,15 @@ impl<'a, C> DmWebhookCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2296,25 +2272,15 @@ impl<'a, C> MediaDownloadCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2322,19 +2288,21 @@ impl<'a, C> MediaDownloadCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = if enable_resource_parsing { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); } } - } else { (reconstructed_result, Default::default()) }; + } else { (res, Default::default()) }; dlg.finished(true); return Ok(result_value) @@ -2558,25 +2526,15 @@ impl<'a, C> RoomConversationMessageCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2584,13 +2542,15 @@ impl<'a, C> RoomConversationMessageCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2836,25 +2796,15 @@ impl<'a, C> RoomMessageCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2862,13 +2812,15 @@ impl<'a, C> RoomMessageCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3114,25 +3066,15 @@ impl<'a, C> RoomWebhookCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3140,13 +3082,15 @@ impl<'a, C> RoomWebhookCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3366,25 +3310,15 @@ impl<'a, C> SpaceMemberGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3392,13 +3326,15 @@ impl<'a, C> SpaceMemberGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3612,25 +3548,15 @@ impl<'a, C> SpaceMemberListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3638,13 +3564,15 @@ impl<'a, C> SpaceMemberListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3862,25 +3790,15 @@ impl<'a, C> SpaceMessageAttachmentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3888,13 +3806,15 @@ impl<'a, C> SpaceMessageAttachmentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4124,25 +4044,15 @@ impl<'a, C> SpaceMessageCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4150,13 +4060,15 @@ impl<'a, C> SpaceMessageCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4376,25 +4288,15 @@ impl<'a, C> SpaceMessageDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4402,13 +4304,15 @@ impl<'a, C> SpaceMessageDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4612,25 +4516,15 @@ impl<'a, C> SpaceMessageGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4638,13 +4532,15 @@ impl<'a, C> SpaceMessageGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4874,25 +4770,15 @@ impl<'a, C> SpaceMessageUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4900,13 +4786,15 @@ impl<'a, C> SpaceMessageUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5125,25 +5013,15 @@ impl<'a, C> SpaceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5151,13 +5029,15 @@ impl<'a, C> SpaceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5344,25 +5224,15 @@ impl<'a, C> SpaceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5370,13 +5240,15 @@ impl<'a, C> SpaceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5610,25 +5482,15 @@ impl<'a, C> SpaceWebhookCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5636,13 +5498,15 @@ impl<'a, C> SpaceWebhookCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/chat1/src/client.rs b/gen/chat1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/chat1/src/client.rs +++ b/gen/chat1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/chromemanagement1-cli/src/main.rs b/gen/chromemanagement1-cli/src/main.rs index 94d0129531..b323ac5488 100644 --- a/gen/chromemanagement1-cli/src/main.rs +++ b/gen/chromemanagement1-cli/src/main.rs @@ -73,7 +73,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "org-unit-id", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "org-unit-id", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -141,7 +141,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "page-token", "page-size", "order-by", "org-unit-id"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "org-unit-id", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -215,7 +215,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["app-id", "filter", "page-token", "page-size", "order-by", "app-type", "org-unit-id"].iter().map(|v|*v)); + v.extend(["app-id", "app-type", "filter", "order-by", "org-unit-id", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/chromemanagement1/src/api.rs b/gen/chromemanagement1/src/api.rs index 6f04206a0d..977222b74c 100644 --- a/gen/chromemanagement1/src/api.rs +++ b/gen/chromemanagement1/src/api.rs @@ -599,25 +599,15 @@ impl<'a, C> CustomerReportCountChromeVersionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -625,13 +615,15 @@ impl<'a, C> CustomerReportCountChromeVersionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -919,25 +911,15 @@ impl<'a, C> CustomerReportCountInstalledAppCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -945,13 +927,15 @@ impl<'a, C> CustomerReportCountInstalledAppCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1256,25 +1240,15 @@ impl<'a, C> CustomerReportFindInstalledAppDeviceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1282,13 +1256,15 @@ impl<'a, C> CustomerReportFindInstalledAppDeviceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/chromemanagement1/src/client.rs b/gen/chromemanagement1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/chromemanagement1/src/client.rs +++ b/gen/chromemanagement1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/chromepolicy1/src/api.rs b/gen/chromepolicy1/src/api.rs index 0e574c6ffc..5819b66491 100644 --- a/gen/chromepolicy1/src/api.rs +++ b/gen/chromepolicy1/src/api.rs @@ -935,25 +935,15 @@ impl<'a, C> CustomerPolicyOrgunitBatchInheritCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -961,13 +951,15 @@ impl<'a, C> CustomerPolicyOrgunitBatchInheritCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1232,25 +1224,15 @@ impl<'a, C> CustomerPolicyOrgunitBatchModifyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1258,13 +1240,15 @@ impl<'a, C> CustomerPolicyOrgunitBatchModifyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1529,25 +1513,15 @@ impl<'a, C> CustomerPolicyResolveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1555,13 +1529,15 @@ impl<'a, C> CustomerPolicyResolveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1805,25 +1781,15 @@ impl<'a, C> CustomerPolicySchemaGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1831,13 +1797,15 @@ impl<'a, C> CustomerPolicySchemaGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2087,25 +2055,15 @@ impl<'a, C> CustomerPolicySchemaListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2113,13 +2071,15 @@ impl<'a, C> CustomerPolicySchemaListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/chromepolicy1/src/client.rs b/gen/chromepolicy1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/chromepolicy1/src/client.rs +++ b/gen/chromepolicy1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/chromeuxreport1/src/api.rs b/gen/chromeuxreport1/src/api.rs index f44e7daa4a..9bd61346b6 100644 --- a/gen/chromeuxreport1/src/api.rs +++ b/gen/chromeuxreport1/src/api.rs @@ -493,25 +493,15 @@ impl<'a, C> RecordQueryRecordCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -519,13 +509,15 @@ impl<'a, C> RecordQueryRecordCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/chromeuxreport1/src/client.rs b/gen/chromeuxreport1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/chromeuxreport1/src/client.rs +++ b/gen/chromeuxreport1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/classroom1-cli/src/main.rs b/gen/classroom1-cli/src/main.rs index f9d4376d53..5eecd7252f 100644 --- a/gen/classroom1-cli/src/main.rs +++ b/gen/classroom1-cli/src/main.rs @@ -204,7 +204,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -468,7 +468,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "order-by", "page-size", "announcement-states"].iter().map(|v|*v)); + v.extend(["announcement-states", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -935,7 +935,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "order-by", "page-size", "course-work-states"].iter().map(|v|*v)); + v.extend(["course-work-states", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1258,7 +1258,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "states", "user-id", "late"].iter().map(|v|*v)); + v.extend(["late", "page-size", "page-token", "states", "user-id"].iter().map(|v|*v)); v } )); } } @@ -1969,7 +1969,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["order-by", "course-work-material-states", "material-link", "material-drive-id", "page-size", "page-token"].iter().map(|v|*v)); + v.extend(["course-work-material-states", "material-drive-id", "material-link", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2345,7 +2345,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["course-states", "student-id", "page-size", "teacher-id", "page-token"].iter().map(|v|*v)); + v.extend(["course-states", "page-size", "page-token", "student-id", "teacher-id"].iter().map(|v|*v)); v } )); } } @@ -2715,7 +2715,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2971,7 +2971,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3222,7 +3222,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3726,7 +3726,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "user-id", "page-size", "course-id"].iter().map(|v|*v)); + v.extend(["course-id", "page-size", "page-token", "user-id"].iter().map(|v|*v)); v } )); } } @@ -4126,7 +4126,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["states", "page-token", "page-size", "invited-email-address"].iter().map(|v|*v)); + v.extend(["invited-email-address", "page-size", "page-token", "states"].iter().map(|v|*v)); v } )); } } @@ -4385,7 +4385,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "invited-email-address"].iter().map(|v|*v)); + v.extend(["invited-email-address", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/classroom1/src/api.rs b/gen/classroom1/src/api.rs index b843cd50b1..a7acec3873 100644 --- a/gen/classroom1/src/api.rs +++ b/gen/classroom1/src/api.rs @@ -3304,25 +3304,15 @@ impl<'a, C> CourseAliaseCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3330,13 +3320,15 @@ impl<'a, C> CourseAliaseCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3578,25 +3570,15 @@ impl<'a, C> CourseAliaseDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3604,13 +3586,15 @@ impl<'a, C> CourseAliaseDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3861,25 +3845,15 @@ impl<'a, C> CourseAliaseListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3887,13 +3861,15 @@ impl<'a, C> CourseAliaseListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4159,25 +4135,15 @@ impl<'a, C> CourseAnnouncementCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4185,13 +4151,15 @@ impl<'a, C> CourseAnnouncementCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4433,25 +4401,15 @@ impl<'a, C> CourseAnnouncementDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4459,13 +4417,15 @@ impl<'a, C> CourseAnnouncementDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4708,25 +4668,15 @@ impl<'a, C> CourseAnnouncementGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4734,13 +4684,15 @@ impl<'a, C> CourseAnnouncementGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5003,25 +4955,15 @@ impl<'a, C> CourseAnnouncementListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5029,13 +4971,15 @@ impl<'a, C> CourseAnnouncementListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5318,25 +5262,15 @@ impl<'a, C> CourseAnnouncementModifyAssigneeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5344,13 +5278,15 @@ impl<'a, C> CourseAnnouncementModifyAssigneeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5628,25 +5564,15 @@ impl<'a, C> CourseAnnouncementPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5654,13 +5580,15 @@ impl<'a, C> CourseAnnouncementPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5921,25 +5849,15 @@ impl<'a, C> CourseCourseWorkStudentSubmissionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5947,13 +5865,15 @@ impl<'a, C> CourseCourseWorkStudentSubmissionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6233,25 +6153,15 @@ impl<'a, C> CourseCourseWorkStudentSubmissionListCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6259,13 +6169,15 @@ impl<'a, C> CourseCourseWorkStudentSubmissionListCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6567,25 +6479,15 @@ impl<'a, C> CourseCourseWorkStudentSubmissionModifyAttachmentCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6593,13 +6495,15 @@ impl<'a, C> CourseCourseWorkStudentSubmissionModifyAttachmentCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6889,25 +6793,15 @@ impl<'a, C> CourseCourseWorkStudentSubmissionPatchCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6915,13 +6809,15 @@ impl<'a, C> CourseCourseWorkStudentSubmissionPatchCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7213,25 +7109,15 @@ impl<'a, C> CourseCourseWorkStudentSubmissionReclaimCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7239,13 +7125,15 @@ impl<'a, C> CourseCourseWorkStudentSubmissionReclaimCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7530,25 +7418,15 @@ impl<'a, C> CourseCourseWorkStudentSubmissionReturnCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7556,13 +7434,15 @@ impl<'a, C> CourseCourseWorkStudentSubmissionReturnCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7847,25 +7727,15 @@ impl<'a, C> CourseCourseWorkStudentSubmissionTurnInCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7873,13 +7743,15 @@ impl<'a, C> CourseCourseWorkStudentSubmissionTurnInCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8160,25 +8032,15 @@ impl<'a, C> CourseCourseWorkCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8186,13 +8048,15 @@ impl<'a, C> CourseCourseWorkCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8434,25 +8298,15 @@ impl<'a, C> CourseCourseWorkDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8460,13 +8314,15 @@ impl<'a, C> CourseCourseWorkDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8709,25 +8565,15 @@ impl<'a, C> CourseCourseWorkGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8735,13 +8581,15 @@ impl<'a, C> CourseCourseWorkGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9004,25 +8852,15 @@ impl<'a, C> CourseCourseWorkListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9030,13 +8868,15 @@ impl<'a, C> CourseCourseWorkListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9319,25 +9159,15 @@ impl<'a, C> CourseCourseWorkModifyAssigneeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9345,13 +9175,15 @@ impl<'a, C> CourseCourseWorkModifyAssigneeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9629,25 +9461,15 @@ impl<'a, C> CourseCourseWorkPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9655,13 +9477,15 @@ impl<'a, C> CourseCourseWorkPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9939,25 +9763,15 @@ impl<'a, C> CourseCourseWorkMaterialCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9965,13 +9779,15 @@ impl<'a, C> CourseCourseWorkMaterialCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10213,25 +10029,15 @@ impl<'a, C> CourseCourseWorkMaterialDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10239,13 +10045,15 @@ impl<'a, C> CourseCourseWorkMaterialDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10488,25 +10296,15 @@ impl<'a, C> CourseCourseWorkMaterialGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10514,13 +10312,15 @@ impl<'a, C> CourseCourseWorkMaterialGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10793,25 +10593,15 @@ impl<'a, C> CourseCourseWorkMaterialListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10819,13 +10609,15 @@ impl<'a, C> CourseCourseWorkMaterialListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11127,25 +10919,15 @@ impl<'a, C> CourseCourseWorkMaterialPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11153,13 +10935,15 @@ impl<'a, C> CourseCourseWorkMaterialPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11442,25 +11226,15 @@ impl<'a, C> CourseStudentCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11468,13 +11242,15 @@ impl<'a, C> CourseStudentCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11723,25 +11499,15 @@ impl<'a, C> CourseStudentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11749,13 +11515,15 @@ impl<'a, C> CourseStudentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11998,25 +11766,15 @@ impl<'a, C> CourseStudentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12024,13 +11782,15 @@ impl<'a, C> CourseStudentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12281,25 +12041,15 @@ impl<'a, C> CourseStudentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12307,13 +12057,15 @@ impl<'a, C> CourseStudentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12579,25 +12331,15 @@ impl<'a, C> CourseTeacherCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12605,13 +12347,15 @@ impl<'a, C> CourseTeacherCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12853,25 +12597,15 @@ impl<'a, C> CourseTeacherDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12879,13 +12613,15 @@ impl<'a, C> CourseTeacherDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13128,25 +12864,15 @@ impl<'a, C> CourseTeacherGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13154,13 +12880,15 @@ impl<'a, C> CourseTeacherGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13411,25 +13139,15 @@ impl<'a, C> CourseTeacherListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13437,13 +13155,15 @@ impl<'a, C> CourseTeacherListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13709,25 +13429,15 @@ impl<'a, C> CourseTopicCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13735,13 +13445,15 @@ impl<'a, C> CourseTopicCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13983,25 +13695,15 @@ impl<'a, C> CourseTopicDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14009,13 +13711,15 @@ impl<'a, C> CourseTopicDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14258,25 +13962,15 @@ impl<'a, C> CourseTopicGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14284,13 +13978,15 @@ impl<'a, C> CourseTopicGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14541,25 +14237,15 @@ impl<'a, C> CourseTopicListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14567,13 +14253,15 @@ impl<'a, C> CourseTopicListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14846,25 +14534,15 @@ impl<'a, C> CourseTopicPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14872,13 +14550,15 @@ impl<'a, C> CourseTopicPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15133,25 +14813,15 @@ impl<'a, C> CourseCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15159,13 +14829,15 @@ impl<'a, C> CourseCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15395,25 +15067,15 @@ impl<'a, C> CourseDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15421,13 +15083,15 @@ impl<'a, C> CourseDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15658,25 +15322,15 @@ impl<'a, C> CourseGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15684,13 +15338,15 @@ impl<'a, C> CourseGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15925,25 +15581,15 @@ impl<'a, C> CourseListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15951,13 +15597,15 @@ impl<'a, C> CourseListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16240,25 +15888,15 @@ impl<'a, C> CoursePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16266,13 +15904,15 @@ impl<'a, C> CoursePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16540,25 +16180,15 @@ impl<'a, C> CourseUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16566,13 +16196,15 @@ impl<'a, C> CourseUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16812,25 +16444,15 @@ impl<'a, C> InvitationAcceptCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16838,13 +16460,15 @@ impl<'a, C> InvitationAcceptCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17073,25 +16697,15 @@ impl<'a, C> InvitationCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17099,13 +16713,15 @@ impl<'a, C> InvitationCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17335,25 +16951,15 @@ impl<'a, C> InvitationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17361,13 +16967,15 @@ impl<'a, C> InvitationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17598,25 +17206,15 @@ impl<'a, C> InvitationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17624,13 +17222,15 @@ impl<'a, C> InvitationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17858,25 +17458,15 @@ impl<'a, C> InvitationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17884,13 +17474,15 @@ impl<'a, C> InvitationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18137,25 +17729,15 @@ impl<'a, C> RegistrationCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18163,13 +17745,15 @@ impl<'a, C> RegistrationCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18399,25 +17983,15 @@ impl<'a, C> RegistrationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18425,13 +17999,15 @@ impl<'a, C> RegistrationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18683,25 +18259,15 @@ impl<'a, C> UserProfileGuardianInvitationCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18709,13 +18275,15 @@ impl<'a, C> UserProfileGuardianInvitationCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18957,25 +18525,15 @@ impl<'a, C> UserProfileGuardianInvitationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18983,13 +18541,15 @@ impl<'a, C> UserProfileGuardianInvitationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19252,25 +18812,15 @@ impl<'a, C> UserProfileGuardianInvitationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19278,13 +18828,15 @@ impl<'a, C> UserProfileGuardianInvitationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19572,25 +19124,15 @@ impl<'a, C> UserProfileGuardianInvitationPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19598,13 +19140,15 @@ impl<'a, C> UserProfileGuardianInvitationPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19863,25 +19407,15 @@ impl<'a, C> UserProfileGuardianDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19889,13 +19423,15 @@ impl<'a, C> UserProfileGuardianDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20138,25 +19674,15 @@ impl<'a, C> UserProfileGuardianGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20164,13 +19690,15 @@ impl<'a, C> UserProfileGuardianGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20426,25 +19954,15 @@ impl<'a, C> UserProfileGuardianListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20452,13 +19970,15 @@ impl<'a, C> UserProfileGuardianListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20710,25 +20230,15 @@ impl<'a, C> UserProfileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20736,13 +20246,15 @@ impl<'a, C> UserProfileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/classroom1/src/client.rs b/gen/classroom1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/classroom1/src/client.rs +++ b/gen/classroom1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/cloudasset1-cli/src/main.rs b/gen/cloudasset1-cli/src/main.rs index 7b756df818..fe1c30ccef 100644 --- a/gen/cloudasset1-cli/src/main.rs +++ b/gen/cloudasset1-cli/src/main.rs @@ -438,7 +438,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["analysis-query-identity-selector-identity", "execution-timeout", "analysis-query-options-output-group-edges", "analysis-query-resource-selector-full-resource-name", "analysis-query-access-selector-permissions", "analysis-query-options-analyze-service-account-impersonation", "analysis-query-options-output-resource-edges", "analysis-query-options-expand-groups", "analysis-query-options-expand-resources", "analysis-query-options-expand-roles", "analysis-query-access-selector-roles"].iter().map(|v|*v)); + v.extend(["analysis-query-access-selector-permissions", "analysis-query-access-selector-roles", "analysis-query-identity-selector-identity", "analysis-query-options-analyze-service-account-impersonation", "analysis-query-options-expand-groups", "analysis-query-options-expand-resources", "analysis-query-options-expand-roles", "analysis-query-options-output-group-edges", "analysis-query-options-output-resource-edges", "analysis-query-resource-selector-full-resource-name", "execution-timeout"].iter().map(|v|*v)); v } )); } } @@ -603,7 +603,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["content-type", "asset-names", "read-time-window-start-time", "read-time-window-end-time"].iter().map(|v|*v)); + v.extend(["asset-names", "content-type", "read-time-window-end-time", "read-time-window-start-time"].iter().map(|v|*v)); v } )); } } @@ -759,7 +759,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "query"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "query"].iter().map(|v|*v)); v } )); } } @@ -827,7 +827,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["asset-types", "page-token", "page-size", "query", "order-by"].iter().map(|v|*v)); + v.extend(["asset-types", "order-by", "page-size", "page-token", "query"].iter().map(|v|*v)); v } )); } } diff --git a/gen/cloudasset1/src/api.rs b/gen/cloudasset1/src/api.rs index 3224c90795..f5fca702cd 100644 --- a/gen/cloudasset1/src/api.rs +++ b/gen/cloudasset1/src/api.rs @@ -2373,25 +2373,15 @@ impl<'a, C> FeedCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2399,13 +2389,15 @@ impl<'a, C> FeedCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2649,25 +2641,15 @@ impl<'a, C> FeedDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2675,13 +2657,15 @@ impl<'a, C> FeedDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2916,25 +2900,15 @@ impl<'a, C> FeedGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2942,13 +2916,15 @@ impl<'a, C> FeedGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3183,25 +3159,15 @@ impl<'a, C> FeedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3209,13 +3175,15 @@ impl<'a, C> FeedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3471,25 +3439,15 @@ impl<'a, C> FeedPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3497,13 +3455,15 @@ impl<'a, C> FeedPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3747,25 +3707,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3773,13 +3723,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4073,25 +4025,15 @@ impl<'a, C> MethodAnalyzeIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4099,13 +4041,15 @@ impl<'a, C> MethodAnalyzeIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4440,25 +4384,15 @@ impl<'a, C> MethodAnalyzeIamPolicyLongrunningCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4466,13 +4400,15 @@ impl<'a, C> MethodAnalyzeIamPolicyLongrunningCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4738,25 +4674,15 @@ impl<'a, C> MethodBatchGetAssetsHistoryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4764,13 +4690,15 @@ impl<'a, C> MethodBatchGetAssetsHistoryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5055,25 +4983,15 @@ impl<'a, C> MethodExportAssetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5081,13 +4999,15 @@ impl<'a, C> MethodExportAssetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5346,25 +5266,15 @@ impl<'a, C> MethodSearchAllIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5372,13 +5282,15 @@ impl<'a, C> MethodSearchAllIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5661,25 +5573,15 @@ impl<'a, C> MethodSearchAllResourceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5687,13 +5589,15 @@ impl<'a, C> MethodSearchAllResourceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/cloudasset1/src/client.rs b/gen/cloudasset1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/cloudasset1/src/client.rs +++ b/gen/cloudasset1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/cloudasset1_beta1-cli/src/main.rs b/gen/cloudasset1_beta1-cli/src/main.rs index b7904d408e..3dedb9f938 100644 --- a/gen/cloudasset1_beta1-cli/src/main.rs +++ b/gen/cloudasset1_beta1-cli/src/main.rs @@ -214,7 +214,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["asset-names", "read-time-window-start-time", "content-type", "read-time-window-end-time"].iter().map(|v|*v)); + v.extend(["asset-names", "content-type", "read-time-window-end-time", "read-time-window-start-time"].iter().map(|v|*v)); v } )); } } @@ -420,7 +420,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["asset-names", "read-time-window-start-time", "content-type", "read-time-window-end-time"].iter().map(|v|*v)); + v.extend(["asset-names", "content-type", "read-time-window-end-time", "read-time-window-start-time"].iter().map(|v|*v)); v } )); } } diff --git a/gen/cloudasset1_beta1/src/api.rs b/gen/cloudasset1_beta1/src/api.rs index c87f193f03..7d8f20cf79 100644 --- a/gen/cloudasset1_beta1/src/api.rs +++ b/gen/cloudasset1_beta1/src/api.rs @@ -1352,25 +1352,15 @@ impl<'a, C> FolderOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1378,13 +1368,15 @@ impl<'a, C> FolderOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1640,25 +1632,15 @@ impl<'a, C> FolderExportAssetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1666,13 +1648,15 @@ impl<'a, C> FolderExportAssetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1916,25 +1900,15 @@ impl<'a, C> OrganizationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1942,13 +1916,15 @@ impl<'a, C> OrganizationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2205,25 +2181,15 @@ impl<'a, C> OrganizationBatchGetAssetsHistoryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2231,13 +2197,15 @@ impl<'a, C> OrganizationBatchGetAssetsHistoryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2522,25 +2490,15 @@ impl<'a, C> OrganizationExportAssetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2548,13 +2506,15 @@ impl<'a, C> OrganizationExportAssetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2798,25 +2758,15 @@ impl<'a, C> ProjectOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2824,13 +2774,15 @@ impl<'a, C> ProjectOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3087,25 +3039,15 @@ impl<'a, C> ProjectBatchGetAssetsHistoryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3113,13 +3055,15 @@ impl<'a, C> ProjectBatchGetAssetsHistoryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3404,25 +3348,15 @@ impl<'a, C> ProjectExportAssetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3430,13 +3364,15 @@ impl<'a, C> ProjectExportAssetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/cloudasset1_beta1/src/client.rs b/gen/cloudasset1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/cloudasset1_beta1/src/client.rs +++ b/gen/cloudasset1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/cloudbilling1-cli/src/main.rs b/gen/cloudbilling1-cli/src/main.rs index 87a84b36c4..fc56604320 100644 --- a/gen/cloudbilling1-cli/src/main.rs +++ b/gen/cloudbilling1-cli/src/main.rs @@ -266,7 +266,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -417,7 +417,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -788,7 +788,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -856,7 +856,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-time", "currency-code", "page-token", "page-size", "end-time"].iter().map(|v|*v)); + v.extend(["currency-code", "end-time", "page-size", "page-token", "start-time"].iter().map(|v|*v)); v } )); } } diff --git a/gen/cloudbilling1/src/api.rs b/gen/cloudbilling1/src/api.rs index 87a9de14b5..9bd48762e0 100644 --- a/gen/cloudbilling1/src/api.rs +++ b/gen/cloudbilling1/src/api.rs @@ -1196,25 +1196,15 @@ impl<'a, C> BillingAccountProjectListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1222,13 +1212,15 @@ impl<'a, C> BillingAccountProjectListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1471,25 +1463,15 @@ impl<'a, C> BillingAccountCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1497,13 +1479,15 @@ impl<'a, C> BillingAccountCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1737,25 +1721,15 @@ impl<'a, C> BillingAccountGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1763,13 +1737,15 @@ impl<'a, C> BillingAccountGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2009,25 +1985,15 @@ impl<'a, C> BillingAccountGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2035,13 +2001,15 @@ impl<'a, C> BillingAccountGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2271,25 +2239,15 @@ impl<'a, C> BillingAccountListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2297,13 +2255,15 @@ impl<'a, C> BillingAccountListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2575,25 +2535,15 @@ impl<'a, C> BillingAccountPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2601,13 +2551,15 @@ impl<'a, C> BillingAccountPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2879,25 +2831,15 @@ impl<'a, C> BillingAccountSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2905,13 +2847,15 @@ impl<'a, C> BillingAccountSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3176,25 +3120,15 @@ impl<'a, C> BillingAccountTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3202,13 +3136,15 @@ impl<'a, C> BillingAccountTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3452,25 +3388,15 @@ impl<'a, C> ProjectGetBillingInfoCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3478,13 +3404,15 @@ impl<'a, C> ProjectGetBillingInfoCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3740,25 +3668,15 @@ impl<'a, C> ProjectUpdateBillingInfoCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3766,13 +3684,15 @@ impl<'a, C> ProjectUpdateBillingInfoCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4041,25 +3961,15 @@ impl<'a, C> ServiceSkuListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4067,13 +3977,15 @@ impl<'a, C> ServiceSkuListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4326,25 +4238,15 @@ impl<'a, C> ServiceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4352,13 +4254,15 @@ impl<'a, C> ServiceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/cloudbilling1/src/client.rs b/gen/cloudbilling1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/cloudbilling1/src/client.rs +++ b/gen/cloudbilling1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/cloudbuild1-cli/src/main.rs b/gen/cloudbuild1-cli/src/main.rs index a80c6ecfce..3f2de7b75a 100644 --- a/gen/cloudbuild1-cli/src/main.rs +++ b/gen/cloudbuild1-cli/src/main.rs @@ -507,7 +507,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter", "parent"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token", "parent"].iter().map(|v|*v)); v } )); } } @@ -960,7 +960,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token", "project-id"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token", "project-id"].iter().map(|v|*v)); v } )); } } diff --git a/gen/cloudbuild1/src/api.rs b/gen/cloudbuild1/src/api.rs index d9cd558b80..4047ff194d 100644 --- a/gen/cloudbuild1/src/api.rs +++ b/gen/cloudbuild1/src/api.rs @@ -1654,25 +1654,15 @@ impl<'a, C> OperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1680,13 +1670,15 @@ impl<'a, C> OperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1930,25 +1922,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1956,13 +1938,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2216,25 +2200,15 @@ impl<'a, C> ProjectBuildCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2242,13 +2216,15 @@ impl<'a, C> ProjectBuildCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2524,25 +2500,15 @@ impl<'a, C> ProjectBuildCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2550,13 +2516,15 @@ impl<'a, C> ProjectBuildCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2810,25 +2778,15 @@ impl<'a, C> ProjectBuildGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2836,13 +2794,15 @@ impl<'a, C> ProjectBuildGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3110,25 +3070,15 @@ impl<'a, C> ProjectBuildListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3136,13 +3086,15 @@ impl<'a, C> ProjectBuildListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3424,25 +3376,15 @@ impl<'a, C> ProjectBuildRetryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3450,13 +3392,15 @@ impl<'a, C> ProjectBuildRetryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3731,25 +3675,15 @@ impl<'a, C> ProjectLocationBuildCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3757,13 +3691,15 @@ impl<'a, C> ProjectLocationBuildCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4033,25 +3969,15 @@ impl<'a, C> ProjectLocationBuildCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4059,13 +3985,15 @@ impl<'a, C> ProjectLocationBuildCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4326,25 +4254,15 @@ impl<'a, C> ProjectLocationBuildGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4352,13 +4270,15 @@ impl<'a, C> ProjectLocationBuildGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4627,25 +4547,15 @@ impl<'a, C> ProjectLocationBuildListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4653,13 +4563,15 @@ impl<'a, C> ProjectLocationBuildListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4943,25 +4855,15 @@ impl<'a, C> ProjectLocationBuildRetryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4969,13 +4871,15 @@ impl<'a, C> ProjectLocationBuildRetryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5240,25 +5144,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5266,13 +5160,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5516,25 +5412,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5542,13 +5428,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5800,25 +5688,15 @@ impl<'a, C> ProjectTriggerCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5826,13 +5704,15 @@ impl<'a, C> ProjectTriggerCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6074,25 +5954,15 @@ impl<'a, C> ProjectTriggerDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6100,13 +5970,15 @@ impl<'a, C> ProjectTriggerDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6349,25 +6221,15 @@ impl<'a, C> ProjectTriggerGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6375,13 +6237,15 @@ impl<'a, C> ProjectTriggerGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6632,25 +6496,15 @@ impl<'a, C> ProjectTriggerListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6658,13 +6512,15 @@ impl<'a, C> ProjectTriggerListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6932,25 +6788,15 @@ impl<'a, C> ProjectTriggerPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6958,13 +6804,15 @@ impl<'a, C> ProjectTriggerPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7237,25 +7085,15 @@ impl<'a, C> ProjectTriggerRunCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7263,13 +7101,15 @@ impl<'a, C> ProjectTriggerRunCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7539,25 +7379,15 @@ impl<'a, C> ProjectTriggerWebhookCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7565,13 +7395,15 @@ impl<'a, C> ProjectTriggerWebhookCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/cloudbuild1/src/client.rs b/gen/cloudbuild1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/cloudbuild1/src/client.rs +++ b/gen/cloudbuild1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/cloudchannel1-cli/src/main.rs b/gen/cloudchannel1-cli/src/main.rs index 772e058482..8fa7e91b43 100644 --- a/gen/cloudchannel1-cli/src/main.rs +++ b/gen/cloudchannel1-cli/src/main.rs @@ -392,7 +392,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -634,7 +634,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "view", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "view"].iter().map(|v|*v)); v } )); } } @@ -1642,7 +1642,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1923,7 +1923,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1994,7 +1994,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["language-code", "page-token", "change-offer-purchase-new-sku", "create-entitlement-purchase-sku", "change-offer-purchase-entitlement", "page-size"].iter().map(|v|*v)); + v.extend(["change-offer-purchase-entitlement", "change-offer-purchase-new-sku", "create-entitlement-purchase-sku", "language-code", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2065,7 +2065,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["language-code", "page-token", "change-offer-purchase-change-type", "create-entitlement-purchase-product", "change-offer-purchase-entitlement", "page-size"].iter().map(|v|*v)); + v.extend(["change-offer-purchase-change-type", "change-offer-purchase-entitlement", "create-entitlement-purchase-product", "language-code", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2517,7 +2517,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2762,7 +2762,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "language-code", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "language-code", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3182,7 +3182,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3247,7 +3247,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "language-code", "page-size", "account"].iter().map(|v|*v)); + v.extend(["account", "language-code", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3312,7 +3312,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "language-code", "page-size", "account"].iter().map(|v|*v)); + v.extend(["account", "language-code", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/cloudchannel1/src/api.rs b/gen/cloudchannel1/src/api.rs index d665a55eeb..0da612da3a 100644 --- a/gen/cloudchannel1/src/api.rs +++ b/gen/cloudchannel1/src/api.rs @@ -2886,25 +2886,15 @@ impl<'a, C> AccountChannelPartnerLinkCustomerCreateCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2912,13 +2902,15 @@ impl<'a, C> AccountChannelPartnerLinkCustomerCreateCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3162,25 +3154,15 @@ impl<'a, C> AccountChannelPartnerLinkCustomerDeleteCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3188,13 +3170,15 @@ impl<'a, C> AccountChannelPartnerLinkCustomerDeleteCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3429,25 +3413,15 @@ impl<'a, C> AccountChannelPartnerLinkCustomerGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3455,13 +3429,15 @@ impl<'a, C> AccountChannelPartnerLinkCustomerGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3706,25 +3682,15 @@ impl<'a, C> AccountChannelPartnerLinkCustomerListCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3732,13 +3698,15 @@ impl<'a, C> AccountChannelPartnerLinkCustomerListCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4013,25 +3981,15 @@ impl<'a, C> AccountChannelPartnerLinkCustomerPatchCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4039,13 +3997,15 @@ impl<'a, C> AccountChannelPartnerLinkCustomerPatchCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4317,25 +4277,15 @@ impl<'a, C> AccountChannelPartnerLinkCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4343,13 +4293,15 @@ impl<'a, C> AccountChannelPartnerLinkCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4598,25 +4550,15 @@ impl<'a, C> AccountChannelPartnerLinkGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4624,13 +4566,15 @@ impl<'a, C> AccountChannelPartnerLinkGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4887,25 +4831,15 @@ impl<'a, C> AccountChannelPartnerLinkListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4913,13 +4847,15 @@ impl<'a, C> AccountChannelPartnerLinkListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5196,25 +5132,15 @@ impl<'a, C> AccountChannelPartnerLinkPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5222,13 +5148,15 @@ impl<'a, C> AccountChannelPartnerLinkPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5493,25 +5421,15 @@ impl<'a, C> AccountCustomerEntitlementActivateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5519,13 +5437,15 @@ impl<'a, C> AccountCustomerEntitlementActivateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5790,25 +5710,15 @@ impl<'a, C> AccountCustomerEntitlementCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5816,13 +5726,15 @@ impl<'a, C> AccountCustomerEntitlementCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6087,25 +5999,15 @@ impl<'a, C> AccountCustomerEntitlementChangeOfferCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6113,13 +6015,15 @@ impl<'a, C> AccountCustomerEntitlementChangeOfferCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6384,25 +6288,15 @@ impl<'a, C> AccountCustomerEntitlementChangeParameterCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6410,13 +6304,15 @@ impl<'a, C> AccountCustomerEntitlementChangeParameterCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6681,25 +6577,15 @@ impl<'a, C> AccountCustomerEntitlementChangeRenewalSettingCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6707,13 +6593,15 @@ impl<'a, C> AccountCustomerEntitlementChangeRenewalSettingCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6978,25 +6866,15 @@ impl<'a, C> AccountCustomerEntitlementCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7004,13 +6882,15 @@ impl<'a, C> AccountCustomerEntitlementCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7254,25 +7134,15 @@ impl<'a, C> AccountCustomerEntitlementGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7280,13 +7150,15 @@ impl<'a, C> AccountCustomerEntitlementGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7531,25 +7403,15 @@ impl<'a, C> AccountCustomerEntitlementListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7557,13 +7419,15 @@ impl<'a, C> AccountCustomerEntitlementListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7833,25 +7697,15 @@ impl<'a, C> AccountCustomerEntitlementStartPaidServiceCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7859,13 +7713,15 @@ impl<'a, C> AccountCustomerEntitlementStartPaidServiceCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8130,25 +7986,15 @@ impl<'a, C> AccountCustomerEntitlementSuspendCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8156,13 +8002,15 @@ impl<'a, C> AccountCustomerEntitlementSuspendCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8427,25 +8275,15 @@ impl<'a, C> AccountCustomerCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8453,13 +8291,15 @@ impl<'a, C> AccountCustomerCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8703,25 +8543,15 @@ impl<'a, C> AccountCustomerDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8729,13 +8559,15 @@ impl<'a, C> AccountCustomerDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8970,25 +8802,15 @@ impl<'a, C> AccountCustomerGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8996,13 +8818,15 @@ impl<'a, C> AccountCustomerGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9247,25 +9071,15 @@ impl<'a, C> AccountCustomerListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9273,13 +9087,15 @@ impl<'a, C> AccountCustomerListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9558,25 +9374,15 @@ impl<'a, C> AccountCustomerListPurchasableOfferCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9584,13 +9390,15 @@ impl<'a, C> AccountCustomerListPurchasableOfferCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9897,25 +9705,15 @@ impl<'a, C> AccountCustomerListPurchasableSkuCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9923,13 +9721,15 @@ impl<'a, C> AccountCustomerListPurchasableSkuCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10232,25 +10032,15 @@ impl<'a, C> AccountCustomerPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10258,13 +10048,15 @@ impl<'a, C> AccountCustomerPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10536,25 +10328,15 @@ impl<'a, C> AccountCustomerProvisionCloudIdentityCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10562,13 +10344,15 @@ impl<'a, C> AccountCustomerProvisionCloudIdentityCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10833,25 +10617,15 @@ impl<'a, C> AccountCustomerTransferEntitlementCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10859,13 +10633,15 @@ impl<'a, C> AccountCustomerTransferEntitlementCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11130,25 +10906,15 @@ impl<'a, C> AccountCustomerTransferEntitlementsToGoogleCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11156,13 +10922,15 @@ impl<'a, C> AccountCustomerTransferEntitlementsToGoogleCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11426,25 +11194,15 @@ impl<'a, C> AccountOfferListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11452,13 +11210,15 @@ impl<'a, C> AccountOfferListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11742,25 +11502,15 @@ impl<'a, C> AccountCheckCloudIdentityAccountsExistCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11768,13 +11518,15 @@ impl<'a, C> AccountCheckCloudIdentityAccountsExistCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12028,25 +11780,15 @@ impl<'a, C> AccountListSubscriberCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12054,13 +11796,15 @@ impl<'a, C> AccountListSubscriberCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12330,25 +12074,15 @@ impl<'a, C> AccountListTransferableOfferCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12356,13 +12090,15 @@ impl<'a, C> AccountListTransferableOfferCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12627,25 +12363,15 @@ impl<'a, C> AccountListTransferableSkuCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12653,13 +12379,15 @@ impl<'a, C> AccountListTransferableSkuCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12924,25 +12652,15 @@ impl<'a, C> AccountRegisterCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12950,13 +12668,15 @@ impl<'a, C> AccountRegisterCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13221,25 +12941,15 @@ impl<'a, C> AccountUnregisterCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13247,13 +12957,15 @@ impl<'a, C> AccountUnregisterCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13518,25 +13230,15 @@ impl<'a, C> OperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13544,13 +13246,15 @@ impl<'a, C> OperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13794,25 +13498,15 @@ impl<'a, C> OperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13820,13 +13514,15 @@ impl<'a, C> OperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14061,25 +13757,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14087,13 +13773,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14343,25 +14031,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14369,13 +14047,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14651,25 +14331,15 @@ impl<'a, C> ProductSkuListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14677,13 +14347,15 @@ impl<'a, C> ProductSkuListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14939,25 +14611,15 @@ impl<'a, C> ProductListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14965,13 +14627,15 @@ impl<'a, C> ProductListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/cloudchannel1/src/client.rs b/gen/cloudchannel1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/cloudchannel1/src/client.rs +++ b/gen/cloudchannel1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/clouddebugger2-cli/src/main.rs b/gen/clouddebugger2-cli/src/main.rs index 91d41ae977..153c35fdd7 100644 --- a/gen/clouddebugger2-cli/src/main.rs +++ b/gen/clouddebugger2-cli/src/main.rs @@ -70,7 +70,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["success-on-timeout", "wait-token", "agent-id"].iter().map(|v|*v)); + v.extend(["agent-id", "success-on-timeout", "wait-token"].iter().map(|v|*v)); v } )); } } @@ -454,7 +454,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["strip-results", "include-inactive", "client-version", "include-all-users", "wait-token", "action-value"].iter().map(|v|*v)); + v.extend(["action-value", "client-version", "include-all-users", "include-inactive", "strip-results", "wait-token"].iter().map(|v|*v)); v } )); } } @@ -565,7 +565,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["client-version", "canary-option"].iter().map(|v|*v)); + v.extend(["canary-option", "client-version"].iter().map(|v|*v)); v } )); } } @@ -627,7 +627,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["client-version", "project", "include-inactive"].iter().map(|v|*v)); + v.extend(["client-version", "include-inactive", "project"].iter().map(|v|*v)); v } )); } } diff --git a/gen/clouddebugger2/src/api.rs b/gen/clouddebugger2/src/api.rs index 22dc106e2f..d475e5d131 100644 --- a/gen/clouddebugger2/src/api.rs +++ b/gen/clouddebugger2/src/api.rs @@ -1147,25 +1147,15 @@ impl<'a, C> ControllerDebuggeeBreakpointListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1173,13 +1163,15 @@ impl<'a, C> ControllerDebuggeeBreakpointListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1454,25 +1446,15 @@ impl<'a, C> ControllerDebuggeeBreakpointUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1480,13 +1462,15 @@ impl<'a, C> ControllerDebuggeeBreakpointUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1734,25 +1718,15 @@ impl<'a, C> ControllerDebuggeeRegisterCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1760,13 +1734,15 @@ impl<'a, C> ControllerDebuggeeRegisterCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2003,25 +1979,15 @@ impl<'a, C> DebuggerDebuggeeBreakpointDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2029,13 +1995,15 @@ impl<'a, C> DebuggerDebuggeeBreakpointDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2290,25 +2258,15 @@ impl<'a, C> DebuggerDebuggeeBreakpointGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2316,13 +2274,15 @@ impl<'a, C> DebuggerDebuggeeBreakpointGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2600,25 +2560,15 @@ impl<'a, C> DebuggerDebuggeeBreakpointListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2626,13 +2576,15 @@ impl<'a, C> DebuggerDebuggeeBreakpointListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2936,25 +2888,15 @@ impl<'a, C> DebuggerDebuggeeBreakpointSetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2962,13 +2904,15 @@ impl<'a, C> DebuggerDebuggeeBreakpointSetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3214,25 +3158,15 @@ impl<'a, C> DebuggerDebuggeeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3240,13 +3174,15 @@ impl<'a, C> DebuggerDebuggeeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/clouddebugger2/src/client.rs b/gen/clouddebugger2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/clouddebugger2/src/client.rs +++ b/gen/clouddebugger2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/clouderrorreporting1_beta1-cli/src/main.rs b/gen/clouderrorreporting1_beta1-cli/src/main.rs index 4257a148fa..d3a454e764 100644 --- a/gen/clouderrorreporting1_beta1-cli/src/main.rs +++ b/gen/clouderrorreporting1_beta1-cli/src/main.rs @@ -134,7 +134,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["time-range-period", "service-filter-version", "service-filter-resource-type", "page-token", "page-size", "group-id", "service-filter-service"].iter().map(|v|*v)); + v.extend(["group-id", "page-size", "page-token", "service-filter-resource-type", "service-filter-service", "service-filter-version", "time-range-period"].iter().map(|v|*v)); v } )); } } @@ -319,7 +319,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["time-range-period", "service-filter-version", "timed-count-duration", "order", "service-filter-resource-type", "page-token", "page-size", "group-id", "service-filter-service", "alignment", "alignment-time"].iter().map(|v|*v)); + v.extend(["alignment", "alignment-time", "group-id", "order", "page-size", "page-token", "service-filter-resource-type", "service-filter-service", "service-filter-version", "time-range-period", "timed-count-duration"].iter().map(|v|*v)); v } )); } } diff --git a/gen/clouderrorreporting1_beta1/src/api.rs b/gen/clouderrorreporting1_beta1/src/api.rs index d8d20a07c9..04aad2204f 100644 --- a/gen/clouderrorreporting1_beta1/src/api.rs +++ b/gen/clouderrorreporting1_beta1/src/api.rs @@ -845,25 +845,15 @@ impl<'a, C> ProjectEventListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -871,13 +861,15 @@ impl<'a, C> ProjectEventListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1182,25 +1174,15 @@ impl<'a, C> ProjectEventReportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1208,13 +1190,15 @@ impl<'a, C> ProjectEventReportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1515,25 +1499,15 @@ impl<'a, C> ProjectGroupStatListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1541,13 +1515,15 @@ impl<'a, C> ProjectGroupStatListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1860,25 +1836,15 @@ impl<'a, C> ProjectGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1886,13 +1852,15 @@ impl<'a, C> ProjectGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2148,25 +2116,15 @@ impl<'a, C> ProjectGroupUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2174,13 +2132,15 @@ impl<'a, C> ProjectGroupUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2424,25 +2384,15 @@ impl<'a, C> ProjectDeleteEventCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2450,13 +2400,15 @@ impl<'a, C> ProjectDeleteEventCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/clouderrorreporting1_beta1/src/client.rs b/gen/clouderrorreporting1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/clouderrorreporting1_beta1/src/client.rs +++ b/gen/clouderrorreporting1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/cloudfunctions1-cli/src/main.rs b/gen/cloudfunctions1-cli/src/main.rs index b733d2bc61..66afed393e 100644 --- a/gen/cloudfunctions1-cli/src/main.rs +++ b/gen/cloudfunctions1-cli/src/main.rs @@ -125,7 +125,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "name", "page-token", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "name", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -712,7 +712,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1064,7 +1064,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "page-token", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/cloudfunctions1/src/api.rs b/gen/cloudfunctions1/src/api.rs index 8f0aa3c818..19f19815b4 100644 --- a/gen/cloudfunctions1/src/api.rs +++ b/gen/cloudfunctions1/src/api.rs @@ -1230,25 +1230,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1256,13 +1246,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1490,25 +1482,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1516,13 +1498,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1796,25 +1780,15 @@ impl<'a, C> ProjectLocationFunctionCallCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1822,13 +1796,15 @@ impl<'a, C> ProjectLocationFunctionCallCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2093,25 +2069,15 @@ impl<'a, C> ProjectLocationFunctionCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2119,13 +2085,15 @@ impl<'a, C> ProjectLocationFunctionCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2369,25 +2337,15 @@ impl<'a, C> ProjectLocationFunctionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2395,13 +2353,15 @@ impl<'a, C> ProjectLocationFunctionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2657,25 +2617,15 @@ impl<'a, C> ProjectLocationFunctionGenerateDownloadUrlCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2683,13 +2633,15 @@ impl<'a, C> ProjectLocationFunctionGenerateDownloadUrlCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2954,25 +2906,15 @@ impl<'a, C> ProjectLocationFunctionGenerateUploadUrlCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2980,13 +2922,15 @@ impl<'a, C> ProjectLocationFunctionGenerateUploadUrlCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3230,25 +3174,15 @@ impl<'a, C> ProjectLocationFunctionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3256,13 +3190,15 @@ impl<'a, C> ProjectLocationFunctionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3502,25 +3438,15 @@ impl<'a, C> ProjectLocationFunctionGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3528,13 +3454,15 @@ impl<'a, C> ProjectLocationFunctionGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3786,25 +3714,15 @@ impl<'a, C> ProjectLocationFunctionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3812,13 +3730,15 @@ impl<'a, C> ProjectLocationFunctionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4093,25 +4013,15 @@ impl<'a, C> ProjectLocationFunctionPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4119,13 +4029,15 @@ impl<'a, C> ProjectLocationFunctionPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4397,25 +4309,15 @@ impl<'a, C> ProjectLocationFunctionSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4423,13 +4325,15 @@ impl<'a, C> ProjectLocationFunctionSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4694,25 +4598,15 @@ impl<'a, C> ProjectLocationFunctionTestIamPermissionCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4720,13 +4614,15 @@ impl<'a, C> ProjectLocationFunctionTestIamPermissionCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4985,25 +4881,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5011,13 +4897,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/cloudfunctions1/src/client.rs b/gen/cloudfunctions1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/cloudfunctions1/src/client.rs +++ b/gen/cloudfunctions1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/cloudidentity1-cli/src/main.rs b/gen/cloudidentity1-cli/src/main.rs index 260555fe1f..7077919894 100644 --- a/gen/cloudidentity1-cli/src/main.rs +++ b/gen/cloudidentity1-cli/src/main.rs @@ -623,7 +623,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "order-by", "customer"].iter().map(|v|*v)); + v.extend(["customer", "filter", "order-by", "page-token"].iter().map(|v|*v)); v } )); } } @@ -893,7 +893,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "customer", "order-by", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["customer", "filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -958,7 +958,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-id", "raw-resource-id", "page-token", "android-id", "page-size"].iter().map(|v|*v)); + v.extend(["android-id", "page-size", "page-token", "raw-resource-id", "user-id"].iter().map(|v|*v)); v } )); } } @@ -1164,7 +1164,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "customer", "order-by", "filter", "view"].iter().map(|v|*v)); + v.extend(["customer", "filter", "order-by", "page-size", "page-token", "view"].iter().map(|v|*v)); v } )); } } @@ -1511,7 +1511,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["parent", "page-token", "view", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "parent", "view"].iter().map(|v|*v)); v } )); } } @@ -1570,7 +1570,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["group-key-namespace", "group-key-id"].iter().map(|v|*v)); + v.extend(["group-key-id", "group-key-namespace"].iter().map(|v|*v)); v } )); } } @@ -1938,7 +1938,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "view", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "view"].iter().map(|v|*v)); v } )); } } @@ -2144,7 +2144,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "query", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "query"].iter().map(|v|*v)); v } )); } } @@ -2203,7 +2203,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2367,7 +2367,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "query", "view", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "query", "view"].iter().map(|v|*v)); v } )); } } diff --git a/gen/cloudidentity1/src/api.rs b/gen/cloudidentity1/src/api.rs index 7186df5c75..1bcc927b7b 100644 --- a/gen/cloudidentity1/src/api.rs +++ b/gen/cloudidentity1/src/api.rs @@ -1979,25 +1979,15 @@ impl<'a, C> DeviceDeviceUserClientStateGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2005,13 +1995,15 @@ impl<'a, C> DeviceDeviceUserClientStateGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2242,25 +2234,15 @@ impl<'a, C> DeviceDeviceUserClientStateListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2268,13 +2250,15 @@ impl<'a, C> DeviceDeviceUserClientStateListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2537,25 +2521,15 @@ impl<'a, C> DeviceDeviceUserClientStatePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2563,13 +2537,15 @@ impl<'a, C> DeviceDeviceUserClientStatePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2817,25 +2793,15 @@ impl<'a, C> DeviceDeviceUserApproveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2843,13 +2809,15 @@ impl<'a, C> DeviceDeviceUserApproveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3083,25 +3051,15 @@ impl<'a, C> DeviceDeviceUserBlockCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3109,13 +3067,15 @@ impl<'a, C> DeviceDeviceUserBlockCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3349,25 +3309,15 @@ impl<'a, C> DeviceDeviceUserCancelWipeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3375,13 +3325,15 @@ impl<'a, C> DeviceDeviceUserCancelWipeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3599,25 +3551,15 @@ impl<'a, C> DeviceDeviceUserDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3625,13 +3567,15 @@ impl<'a, C> DeviceDeviceUserDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3847,25 +3791,15 @@ impl<'a, C> DeviceDeviceUserGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3873,13 +3807,15 @@ impl<'a, C> DeviceDeviceUserGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4115,25 +4051,15 @@ impl<'a, C> DeviceDeviceUserListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4141,13 +4067,15 @@ impl<'a, C> DeviceDeviceUserListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4419,25 +4347,15 @@ impl<'a, C> DeviceDeviceUserLookupCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4445,13 +4363,15 @@ impl<'a, C> DeviceDeviceUserLookupCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4734,25 +4654,15 @@ impl<'a, C> DeviceDeviceUserWipeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4760,13 +4670,15 @@ impl<'a, C> DeviceDeviceUserWipeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5000,25 +4912,15 @@ impl<'a, C> DeviceCancelWipeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5026,13 +4928,15 @@ impl<'a, C> DeviceCancelWipeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5244,25 +5148,15 @@ impl<'a, C> DeviceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5270,13 +5164,15 @@ impl<'a, C> DeviceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5491,25 +5387,15 @@ impl<'a, C> DeviceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5517,13 +5403,15 @@ impl<'a, C> DeviceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5739,25 +5627,15 @@ impl<'a, C> DeviceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5765,13 +5643,15 @@ impl<'a, C> DeviceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5985,25 +5865,15 @@ impl<'a, C> DeviceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6011,13 +5881,15 @@ impl<'a, C> DeviceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6274,25 +6146,15 @@ impl<'a, C> DeviceWipeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6300,13 +6162,15 @@ impl<'a, C> DeviceWipeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6532,25 +6396,15 @@ impl<'a, C> GroupMembershipCheckTransitiveMembershipCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6558,13 +6412,15 @@ impl<'a, C> GroupMembershipCheckTransitiveMembershipCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6827,25 +6683,15 @@ impl<'a, C> GroupMembershipCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6853,13 +6699,15 @@ impl<'a, C> GroupMembershipCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7103,25 +6951,15 @@ impl<'a, C> GroupMembershipDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7129,13 +6967,15 @@ impl<'a, C> GroupMembershipDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7370,25 +7210,15 @@ impl<'a, C> GroupMembershipGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7396,13 +7226,15 @@ impl<'a, C> GroupMembershipGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7642,25 +7474,15 @@ impl<'a, C> GroupMembershipGetMembershipGraphCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7668,13 +7490,15 @@ impl<'a, C> GroupMembershipGetMembershipGraphCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7931,25 +7755,15 @@ impl<'a, C> GroupMembershipListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7957,13 +7771,15 @@ impl<'a, C> GroupMembershipListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8229,25 +8045,15 @@ impl<'a, C> GroupMembershipLookupCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8255,13 +8061,15 @@ impl<'a, C> GroupMembershipLookupCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8531,25 +8339,15 @@ impl<'a, C> GroupMembershipModifyMembershipRoleCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8557,13 +8355,15 @@ impl<'a, C> GroupMembershipModifyMembershipRoleCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8822,25 +8622,15 @@ impl<'a, C> GroupMembershipSearchTransitiveGroupCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8848,13 +8638,15 @@ impl<'a, C> GroupMembershipSearchTransitiveGroupCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9120,25 +8912,15 @@ impl<'a, C> GroupMembershipSearchTransitiveMembershipCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9146,13 +8928,15 @@ impl<'a, C> GroupMembershipSearchTransitiveMembershipCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9400,25 +9184,15 @@ impl<'a, C> GroupCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9426,13 +9200,15 @@ impl<'a, C> GroupCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9673,25 +9449,15 @@ impl<'a, C> GroupDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9699,13 +9465,15 @@ impl<'a, C> GroupDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9940,25 +9708,15 @@ impl<'a, C> GroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9966,13 +9724,15 @@ impl<'a, C> GroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10200,25 +9960,15 @@ impl<'a, C> GroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10226,13 +9976,15 @@ impl<'a, C> GroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10468,25 +10220,15 @@ impl<'a, C> GroupLookupCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10494,13 +10236,15 @@ impl<'a, C> GroupLookupCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10765,25 +10509,15 @@ impl<'a, C> GroupPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10791,13 +10525,15 @@ impl<'a, C> GroupPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11041,25 +10777,15 @@ impl<'a, C> GroupSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11067,13 +10793,15 @@ impl<'a, C> GroupSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/cloudidentity1/src/client.rs b/gen/cloudidentity1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/cloudidentity1/src/client.rs +++ b/gen/cloudidentity1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/cloudiot1-cli/src/main.rs b/gen/cloudiot1-cli/src/main.rs index 81a25f7c66..b36879e6f5 100644 --- a/gen/cloudiot1-cli/src/main.rs +++ b/gen/cloudiot1-cli/src/main.rs @@ -585,7 +585,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["gateway-list-options-associations-device-id", "field-mask", "device-ids", "page-size", "page-token", "gateway-list-options-gateway-type", "gateway-list-options-associations-gateway-id", "device-num-ids"].iter().map(|v|*v)); + v.extend(["device-ids", "device-num-ids", "field-mask", "gateway-list-options-associations-device-id", "gateway-list-options-associations-gateway-id", "gateway-list-options-gateway-type", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1139,7 +1139,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["gateway-list-options-associations-device-id", "field-mask", "device-ids", "page-size", "page-token", "gateway-list-options-gateway-type", "gateway-list-options-associations-gateway-id", "device-num-ids"].iter().map(|v|*v)); + v.extend(["device-ids", "device-num-ids", "field-mask", "gateway-list-options-associations-device-id", "gateway-list-options-associations-gateway-id", "gateway-list-options-gateway-type", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1454,7 +1454,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/cloudiot1/src/api.rs b/gen/cloudiot1/src/api.rs index 6fe4c33a80..ddac31a4c2 100644 --- a/gen/cloudiot1/src/api.rs +++ b/gen/cloudiot1/src/api.rs @@ -1530,25 +1530,15 @@ impl<'a, C> ProjectLocationRegistryDeviceConfigVersionListCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1556,13 +1546,15 @@ impl<'a, C> ProjectLocationRegistryDeviceConfigVersionListCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1809,25 +1801,15 @@ impl<'a, C> ProjectLocationRegistryDeviceStateListCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1835,13 +1817,15 @@ impl<'a, C> ProjectLocationRegistryDeviceStateListCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2104,25 +2088,15 @@ impl<'a, C> ProjectLocationRegistryDeviceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2130,13 +2104,15 @@ impl<'a, C> ProjectLocationRegistryDeviceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2380,25 +2356,15 @@ impl<'a, C> ProjectLocationRegistryDeviceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2406,13 +2372,15 @@ impl<'a, C> ProjectLocationRegistryDeviceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2652,25 +2620,15 @@ impl<'a, C> ProjectLocationRegistryDeviceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2678,13 +2636,15 @@ impl<'a, C> ProjectLocationRegistryDeviceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2970,25 +2930,15 @@ impl<'a, C> ProjectLocationRegistryDeviceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2996,13 +2946,15 @@ impl<'a, C> ProjectLocationRegistryDeviceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3316,25 +3268,15 @@ impl<'a, C> ProjectLocationRegistryDeviceModifyCloudToDeviceConfigCall<'a, C> wh return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3342,13 +3284,15 @@ impl<'a, C> ProjectLocationRegistryDeviceModifyCloudToDeviceConfigCall<'a, C> wh } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3618,25 +3562,15 @@ impl<'a, C> ProjectLocationRegistryDevicePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3644,13 +3578,15 @@ impl<'a, C> ProjectLocationRegistryDevicePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3922,25 +3858,15 @@ impl<'a, C> ProjectLocationRegistryDeviceSendCommandToDeviceCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3948,13 +3874,15 @@ impl<'a, C> ProjectLocationRegistryDeviceSendCommandToDeviceCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4242,25 +4170,15 @@ impl<'a, C> ProjectLocationRegistryGroupDeviceListCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4268,13 +4186,15 @@ impl<'a, C> ProjectLocationRegistryGroupDeviceListCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4588,25 +4508,15 @@ impl<'a, C> ProjectLocationRegistryGroupGetIamPolicyCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4614,13 +4524,15 @@ impl<'a, C> ProjectLocationRegistryGroupGetIamPolicyCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4885,25 +4797,15 @@ impl<'a, C> ProjectLocationRegistryGroupSetIamPolicyCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4911,13 +4813,15 @@ impl<'a, C> ProjectLocationRegistryGroupSetIamPolicyCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5182,25 +5086,15 @@ impl<'a, C> ProjectLocationRegistryGroupTestIamPermissionCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5208,13 +5102,15 @@ impl<'a, C> ProjectLocationRegistryGroupTestIamPermissionCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5479,25 +5375,15 @@ impl<'a, C> ProjectLocationRegistryBindDeviceToGatewayCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5505,13 +5391,15 @@ impl<'a, C> ProjectLocationRegistryBindDeviceToGatewayCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5776,25 +5664,15 @@ impl<'a, C> ProjectLocationRegistryCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5802,13 +5680,15 @@ impl<'a, C> ProjectLocationRegistryCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6052,25 +5932,15 @@ impl<'a, C> ProjectLocationRegistryDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6078,13 +5948,15 @@ impl<'a, C> ProjectLocationRegistryDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6319,25 +6191,15 @@ impl<'a, C> ProjectLocationRegistryGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6345,13 +6207,15 @@ impl<'a, C> ProjectLocationRegistryGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6607,25 +6471,15 @@ impl<'a, C> ProjectLocationRegistryGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6633,13 +6487,15 @@ impl<'a, C> ProjectLocationRegistryGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6893,25 +6749,15 @@ impl<'a, C> ProjectLocationRegistryListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6919,13 +6765,15 @@ impl<'a, C> ProjectLocationRegistryListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7200,25 +7048,15 @@ impl<'a, C> ProjectLocationRegistryPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7226,13 +7064,15 @@ impl<'a, C> ProjectLocationRegistryPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7504,25 +7344,15 @@ impl<'a, C> ProjectLocationRegistrySetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7530,13 +7360,15 @@ impl<'a, C> ProjectLocationRegistrySetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7801,25 +7633,15 @@ impl<'a, C> ProjectLocationRegistryTestIamPermissionCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7827,13 +7649,15 @@ impl<'a, C> ProjectLocationRegistryTestIamPermissionCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8098,25 +7922,15 @@ impl<'a, C> ProjectLocationRegistryUnbindDeviceFromGatewayCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8124,13 +7938,15 @@ impl<'a, C> ProjectLocationRegistryUnbindDeviceFromGatewayCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/cloudiot1/src/client.rs b/gen/cloudiot1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/cloudiot1/src/client.rs +++ b/gen/cloudiot1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/cloudkms1-cli/src/main.rs b/gen/cloudkms1-cli/src/main.rs index 2741dd67b8..419f03727a 100644 --- a/gen/cloudkms1-cli/src/main.rs +++ b/gen/cloudkms1-cli/src/main.rs @@ -266,7 +266,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["skip-initial-version-creation", "crypto-key-id"].iter().map(|v|*v)); + v.extend(["crypto-key-id", "skip-initial-version-creation"].iter().map(|v|*v)); v } )); } } @@ -884,7 +884,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token", "view", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token", "view"].iter().map(|v|*v)); v } )); } } @@ -1425,7 +1425,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["version-view", "page-size", "filter", "page-token", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token", "version-view"].iter().map(|v|*v)); v } )); } } @@ -2178,7 +2178,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "order-by", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2415,7 +2415,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "order-by", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2649,7 +2649,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/cloudkms1/src/api.rs b/gen/cloudkms1/src/api.rs index 558a698a41..4723258199 100644 --- a/gen/cloudkms1/src/api.rs +++ b/gen/cloudkms1/src/api.rs @@ -1921,25 +1921,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCryptoKeyVersionAsymmetricDecryptCall return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1947,13 +1937,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCryptoKeyVersionAsymmetricDecryptCall } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2218,25 +2210,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCryptoKeyVersionAsymmetricSignCall<'a return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2244,13 +2226,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCryptoKeyVersionAsymmetricSignCall<'a } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2515,25 +2499,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCryptoKeyVersionCreateCall<'a, C> whe return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2541,13 +2515,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCryptoKeyVersionCreateCall<'a, C> whe } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2812,25 +2788,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCryptoKeyVersionDestroyCall<'a, C> wh return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2838,13 +2804,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCryptoKeyVersionDestroyCall<'a, C> wh } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3088,25 +3056,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCryptoKeyVersionGetCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3114,13 +3072,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCryptoKeyVersionGetCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3355,25 +3315,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCryptoKeyVersionGetPublicKeyCall<'a, return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3381,13 +3331,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCryptoKeyVersionGetPublicKeyCall<'a, } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3643,25 +3595,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCryptoKeyVersionImportCall<'a, C> whe return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3669,13 +3611,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCryptoKeyVersionImportCall<'a, C> whe } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3944,25 +3888,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCryptoKeyVersionListCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3970,13 +3904,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCryptoKeyVersionListCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4272,25 +4208,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCryptoKeyVersionPatchCall<'a, C> wher return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4298,13 +4224,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCryptoKeyVersionPatchCall<'a, C> wher } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4576,25 +4504,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCryptoKeyVersionRestoreCall<'a, C> wh return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4602,13 +4520,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCryptoKeyVersionRestoreCall<'a, C> wh } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4883,25 +4803,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCreateCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4909,13 +4819,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCreateCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5194,25 +5106,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyDecryptCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5220,13 +5122,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyDecryptCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5491,25 +5395,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyEncryptCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5517,13 +5411,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyEncryptCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5767,25 +5663,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5793,13 +5679,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6039,25 +5927,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyGetIamPolicyCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6065,13 +5943,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyGetIamPolicyCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6338,25 +6218,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6364,13 +6234,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6666,25 +6538,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6692,13 +6554,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6970,25 +6834,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeySetIamPolicyCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6996,13 +6850,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeySetIamPolicyCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7267,25 +7123,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyTestIamPermissionCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7293,13 +7139,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyTestIamPermissionCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7564,25 +7412,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyUpdatePrimaryVersionCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7590,13 +7428,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyUpdatePrimaryVersionCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7866,25 +7706,15 @@ impl<'a, C> ProjectLocationKeyRingImportJobCreateCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7892,13 +7722,15 @@ impl<'a, C> ProjectLocationKeyRingImportJobCreateCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8149,25 +7981,15 @@ impl<'a, C> ProjectLocationKeyRingImportJobGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8175,13 +7997,15 @@ impl<'a, C> ProjectLocationKeyRingImportJobGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8421,25 +8245,15 @@ impl<'a, C> ProjectLocationKeyRingImportJobGetIamPolicyCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8447,13 +8261,15 @@ impl<'a, C> ProjectLocationKeyRingImportJobGetIamPolicyCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8715,25 +8531,15 @@ impl<'a, C> ProjectLocationKeyRingImportJobListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8741,13 +8547,15 @@ impl<'a, C> ProjectLocationKeyRingImportJobListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9031,25 +8839,15 @@ impl<'a, C> ProjectLocationKeyRingImportJobSetIamPolicyCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9057,13 +8855,15 @@ impl<'a, C> ProjectLocationKeyRingImportJobSetIamPolicyCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9328,25 +9128,15 @@ impl<'a, C> ProjectLocationKeyRingImportJobTestIamPermissionCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9354,13 +9144,15 @@ impl<'a, C> ProjectLocationKeyRingImportJobTestIamPermissionCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9630,25 +9422,15 @@ impl<'a, C> ProjectLocationKeyRingCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9656,13 +9438,15 @@ impl<'a, C> ProjectLocationKeyRingCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9913,25 +9697,15 @@ impl<'a, C> ProjectLocationKeyRingGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9939,13 +9713,15 @@ impl<'a, C> ProjectLocationKeyRingGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10185,25 +9961,15 @@ impl<'a, C> ProjectLocationKeyRingGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10211,13 +9977,15 @@ impl<'a, C> ProjectLocationKeyRingGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10479,25 +10247,15 @@ impl<'a, C> ProjectLocationKeyRingListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10505,13 +10263,15 @@ impl<'a, C> ProjectLocationKeyRingListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10795,25 +10555,15 @@ impl<'a, C> ProjectLocationKeyRingSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10821,13 +10571,15 @@ impl<'a, C> ProjectLocationKeyRingSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11092,25 +10844,15 @@ impl<'a, C> ProjectLocationKeyRingTestIamPermissionCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11118,13 +10860,15 @@ impl<'a, C> ProjectLocationKeyRingTestIamPermissionCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11368,25 +11112,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11394,13 +11128,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11650,25 +11386,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11676,13 +11402,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/cloudkms1/src/client.rs b/gen/cloudkms1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/cloudkms1/src/client.rs +++ b/gen/cloudkms1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/cloudkms1_beta1-cli/src/main.rs b/gen/cloudkms1_beta1-cli/src/main.rs index 7e7905266a..13f7dcc144 100644 --- a/gen/cloudkms1_beta1-cli/src/main.rs +++ b/gen/cloudkms1_beta1-cli/src/main.rs @@ -1798,7 +1798,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/cloudkms1_beta1/src/api.rs b/gen/cloudkms1_beta1/src/api.rs index 2f22da5c5d..3e94e50820 100644 --- a/gen/cloudkms1_beta1/src/api.rs +++ b/gen/cloudkms1_beta1/src/api.rs @@ -1697,25 +1697,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCryptoKeyVersionListCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1723,13 +1713,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCryptoKeyVersionListCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2011,25 +2003,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCryptoKeyVersionCreateCall<'a, C> whe return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2037,13 +2019,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCryptoKeyVersionCreateCall<'a, C> whe } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2322,25 +2306,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCryptoKeyVersionDestroyCall<'a, C> wh return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2348,13 +2322,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCryptoKeyVersionDestroyCall<'a, C> wh } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2627,25 +2603,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCryptoKeyVersionRestoreCall<'a, C> wh return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2653,13 +2619,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCryptoKeyVersionRestoreCall<'a, C> wh } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2937,25 +2905,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCryptoKeyVersionPatchCall<'a, C> wher return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2963,13 +2921,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCryptoKeyVersionPatchCall<'a, C> wher } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3223,25 +3183,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCryptoKeyVersionGetCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3249,13 +3199,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCryptoKeyVersionGetCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3518,25 +3470,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3544,13 +3486,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3805,25 +3749,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3831,13 +3765,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4101,25 +4037,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyTestIamPermissionCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4127,13 +4053,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyTestIamPermissionCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4401,25 +4329,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyDecryptCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4427,13 +4345,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyDecryptCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4690,25 +4610,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4716,13 +4626,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4999,25 +4911,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyEncryptCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5025,13 +4927,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyEncryptCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5309,25 +5213,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCreateCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5335,13 +5229,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyCreateCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5618,25 +5514,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeySetIamPolicyCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5644,13 +5530,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeySetIamPolicyCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5918,25 +5806,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyUpdatePrimaryVersionCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5944,13 +5822,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyUpdatePrimaryVersionCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6198,25 +6078,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyGetIamPolicyCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6224,13 +6094,15 @@ impl<'a, C> ProjectLocationKeyRingCryptoKeyGetIamPolicyCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6470,25 +6342,15 @@ impl<'a, C> ProjectLocationKeyRingGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6496,13 +6358,15 @@ impl<'a, C> ProjectLocationKeyRingGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6740,25 +6604,15 @@ impl<'a, C> ProjectLocationKeyRingGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6766,13 +6620,15 @@ impl<'a, C> ProjectLocationKeyRingGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7036,25 +6892,15 @@ impl<'a, C> ProjectLocationKeyRingTestIamPermissionCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7062,13 +6908,15 @@ impl<'a, C> ProjectLocationKeyRingTestIamPermissionCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7325,25 +7173,15 @@ impl<'a, C> ProjectLocationKeyRingListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7351,13 +7189,15 @@ impl<'a, C> ProjectLocationKeyRingListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7635,25 +7475,15 @@ impl<'a, C> ProjectLocationKeyRingSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7661,13 +7491,15 @@ impl<'a, C> ProjectLocationKeyRingSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7940,25 +7772,15 @@ impl<'a, C> ProjectLocationKeyRingCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7966,13 +7788,15 @@ impl<'a, C> ProjectLocationKeyRingCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8242,25 +8066,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8268,13 +8082,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8532,25 +8348,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8558,13 +8364,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/cloudkms1_beta1/src/client.rs b/gen/cloudkms1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/cloudkms1_beta1/src/client.rs +++ b/gen/cloudkms1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/cloudlatencytest2/src/api.rs b/gen/cloudlatencytest2/src/api.rs index 5335e06dad..2e1d6c5f8b 100644 --- a/gen/cloudlatencytest2/src/api.rs +++ b/gen/cloudlatencytest2/src/api.rs @@ -517,25 +517,15 @@ impl<'a, C> StatscollectionUpdateaggregatedstatCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -543,13 +533,15 @@ impl<'a, C> StatscollectionUpdateaggregatedstatCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -773,25 +765,15 @@ impl<'a, C> StatscollectionUpdatestatCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -799,13 +781,15 @@ impl<'a, C> StatscollectionUpdatestatCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/cloudlatencytest2/src/client.rs b/gen/cloudlatencytest2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/cloudlatencytest2/src/client.rs +++ b/gen/cloudlatencytest2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/cloudmonitoring2_beta2-cli/src/main.rs b/gen/cloudmonitoring2_beta2-cli/src/main.rs index 1c71626231..bbbd11bc5f 100644 --- a/gen/cloudmonitoring2_beta2-cli/src/main.rs +++ b/gen/cloudmonitoring2_beta2-cli/src/main.rs @@ -244,7 +244,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["count", "query", "page-token"].iter().map(|v|*v)); + v.extend(["count", "page-token", "query"].iter().map(|v|*v)); v } )); } } @@ -351,7 +351,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["aggregator", "labels", "timespan", "count", "window", "page-token", "oldest"].iter().map(|v|*v)); + v.extend(["aggregator", "count", "labels", "oldest", "page-token", "timespan", "window"].iter().map(|v|*v)); v } )); } } @@ -543,7 +543,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["aggregator", "labels", "timespan", "count", "window", "page-token", "oldest"].iter().map(|v|*v)); + v.extend(["aggregator", "count", "labels", "oldest", "page-token", "timespan", "window"].iter().map(|v|*v)); v } )); } } diff --git a/gen/cloudmonitoring2_beta2/src/api.rs b/gen/cloudmonitoring2_beta2/src/api.rs index 063783f036..62b2e9675b 100644 --- a/gen/cloudmonitoring2_beta2/src/api.rs +++ b/gen/cloudmonitoring2_beta2/src/api.rs @@ -1021,25 +1021,15 @@ impl<'a, C> MetricDescriptorCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1047,13 +1037,15 @@ impl<'a, C> MetricDescriptorCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1291,25 +1283,15 @@ impl<'a, C> MetricDescriptorDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1317,13 +1299,15 @@ impl<'a, C> MetricDescriptorDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1596,25 +1580,15 @@ impl<'a, C> MetricDescriptorListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1622,13 +1596,15 @@ impl<'a, C> MetricDescriptorListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1947,25 +1923,15 @@ impl<'a, C> TimeseryListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1973,13 +1939,15 @@ impl<'a, C> TimeseryListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2322,25 +2290,15 @@ impl<'a, C> TimeseryWriteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2348,13 +2306,15 @@ impl<'a, C> TimeseryWriteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2652,25 +2612,15 @@ impl<'a, C> TimeseriesDescriptorListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2678,13 +2628,15 @@ impl<'a, C> TimeseriesDescriptorListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/cloudmonitoring2_beta2/src/client.rs b/gen/cloudmonitoring2_beta2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/cloudmonitoring2_beta2/src/client.rs +++ b/gen/cloudmonitoring2_beta2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/cloudprivatecatalog1_beta1-cli/src/main.rs b/gen/cloudprivatecatalog1_beta1-cli/src/main.rs index 0233f83b3e..8b64e78c97 100644 --- a/gen/cloudprivatecatalog1_beta1-cli/src/main.rs +++ b/gen/cloudprivatecatalog1_beta1-cli/src/main.rs @@ -70,7 +70,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "query", "page-token"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "query"].iter().map(|v|*v)); v } )); } } @@ -132,7 +132,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "query", "page-token"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "query"].iter().map(|v|*v)); v } )); } } @@ -194,7 +194,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "query", "page-token"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "query"].iter().map(|v|*v)); v } )); } } @@ -256,7 +256,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "query", "page-token"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "query"].iter().map(|v|*v)); v } )); } } @@ -318,7 +318,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "query", "page-token"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "query"].iter().map(|v|*v)); v } )); } } @@ -380,7 +380,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "query", "page-token"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "query"].iter().map(|v|*v)); v } )); } } @@ -442,7 +442,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "query", "page-token"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "query"].iter().map(|v|*v)); v } )); } } @@ -504,7 +504,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "query", "page-token"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "query"].iter().map(|v|*v)); v } )); } } @@ -566,7 +566,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "query", "page-token"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "query"].iter().map(|v|*v)); v } )); } } diff --git a/gen/cloudprivatecatalog1_beta1/src/api.rs b/gen/cloudprivatecatalog1_beta1/src/api.rs index aab8aabcd5..349782c22d 100644 --- a/gen/cloudprivatecatalog1_beta1/src/api.rs +++ b/gen/cloudprivatecatalog1_beta1/src/api.rs @@ -943,25 +943,15 @@ impl<'a, C> FolderCatalogSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -969,13 +959,15 @@ impl<'a, C> FolderCatalogSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1255,25 +1247,15 @@ impl<'a, C> FolderProductSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1281,13 +1263,15 @@ impl<'a, C> FolderProductSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1568,25 +1552,15 @@ impl<'a, C> FolderVersionSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1594,13 +1568,15 @@ impl<'a, C> FolderVersionSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1881,25 +1857,15 @@ impl<'a, C> OrganizationCatalogSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1907,13 +1873,15 @@ impl<'a, C> OrganizationCatalogSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2193,25 +2161,15 @@ impl<'a, C> OrganizationProductSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2219,13 +2177,15 @@ impl<'a, C> OrganizationProductSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2506,25 +2466,15 @@ impl<'a, C> OrganizationVersionSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2532,13 +2482,15 @@ impl<'a, C> OrganizationVersionSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2819,25 +2771,15 @@ impl<'a, C> ProjectCatalogSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2845,13 +2787,15 @@ impl<'a, C> ProjectCatalogSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3131,25 +3075,15 @@ impl<'a, C> ProjectProductSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3157,13 +3091,15 @@ impl<'a, C> ProjectProductSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3444,25 +3380,15 @@ impl<'a, C> ProjectVersionSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3470,13 +3396,15 @@ impl<'a, C> ProjectVersionSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/cloudprivatecatalog1_beta1/src/client.rs b/gen/cloudprivatecatalog1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/cloudprivatecatalog1_beta1/src/client.rs +++ b/gen/cloudprivatecatalog1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/cloudprivatecatalogproducer1_beta1-cli/src/main.rs b/gen/cloudprivatecatalogproducer1_beta1-cli/src/main.rs index b3b9db5f33..92b1ed0e1b 100644 --- a/gen/cloudprivatecatalogproducer1_beta1-cli/src/main.rs +++ b/gen/cloudprivatecatalogproducer1_beta1-cli/src/main.rs @@ -574,7 +574,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "parent", "page-token"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "parent"].iter().map(|v|*v)); v } )); } } diff --git a/gen/cloudprivatecatalogproducer1_beta1/src/api.rs b/gen/cloudprivatecatalogproducer1_beta1/src/api.rs index e44d3072dc..8a5f55dc9e 100644 --- a/gen/cloudprivatecatalogproducer1_beta1/src/api.rs +++ b/gen/cloudprivatecatalogproducer1_beta1/src/api.rs @@ -2060,25 +2060,15 @@ impl<'a, C> CatalogAssociationCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2086,13 +2076,15 @@ impl<'a, C> CatalogAssociationCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2336,25 +2328,15 @@ impl<'a, C> CatalogAssociationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2362,13 +2344,15 @@ impl<'a, C> CatalogAssociationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2603,25 +2587,15 @@ impl<'a, C> CatalogAssociationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2629,13 +2603,15 @@ impl<'a, C> CatalogAssociationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2880,25 +2856,15 @@ impl<'a, C> CatalogAssociationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2906,13 +2872,15 @@ impl<'a, C> CatalogAssociationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3189,25 +3157,15 @@ impl<'a, C> CatalogProductIconUploadCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3215,13 +3173,15 @@ impl<'a, C> CatalogProductIconUploadCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3486,25 +3446,15 @@ impl<'a, C> CatalogProductVersionCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3512,13 +3462,15 @@ impl<'a, C> CatalogProductVersionCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3762,25 +3714,15 @@ impl<'a, C> CatalogProductVersionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3788,13 +3730,15 @@ impl<'a, C> CatalogProductVersionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4029,25 +3973,15 @@ impl<'a, C> CatalogProductVersionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4055,13 +3989,15 @@ impl<'a, C> CatalogProductVersionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4307,25 +4243,15 @@ impl<'a, C> CatalogProductVersionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4333,13 +4259,15 @@ impl<'a, C> CatalogProductVersionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4616,25 +4544,15 @@ impl<'a, C> CatalogProductVersionPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4642,13 +4560,15 @@ impl<'a, C> CatalogProductVersionPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4925,25 +4845,15 @@ impl<'a, C> CatalogProductCopyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4951,13 +4861,15 @@ impl<'a, C> CatalogProductCopyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5222,25 +5134,15 @@ impl<'a, C> CatalogProductCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5248,13 +5150,15 @@ impl<'a, C> CatalogProductCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5498,25 +5402,15 @@ impl<'a, C> CatalogProductDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5524,13 +5418,15 @@ impl<'a, C> CatalogProductDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5765,25 +5661,15 @@ impl<'a, C> CatalogProductGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5791,13 +5677,15 @@ impl<'a, C> CatalogProductGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6048,25 +5936,15 @@ impl<'a, C> CatalogProductListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6074,13 +5952,15 @@ impl<'a, C> CatalogProductListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6365,25 +6245,15 @@ impl<'a, C> CatalogProductPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6391,13 +6261,15 @@ impl<'a, C> CatalogProductPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6647,25 +6519,15 @@ impl<'a, C> CatalogCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6673,13 +6535,15 @@ impl<'a, C> CatalogCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6922,25 +6786,15 @@ impl<'a, C> CatalogDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6948,13 +6802,15 @@ impl<'a, C> CatalogDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7198,25 +7054,15 @@ impl<'a, C> CatalogGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7224,13 +7070,15 @@ impl<'a, C> CatalogGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7470,25 +7318,15 @@ impl<'a, C> CatalogGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7496,13 +7334,15 @@ impl<'a, C> CatalogGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7741,25 +7581,15 @@ impl<'a, C> CatalogListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7767,13 +7597,15 @@ impl<'a, C> CatalogListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8047,25 +7879,15 @@ impl<'a, C> CatalogPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8073,13 +7895,15 @@ impl<'a, C> CatalogPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8355,25 +8179,15 @@ impl<'a, C> CatalogSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8381,13 +8195,15 @@ impl<'a, C> CatalogSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8653,25 +8469,15 @@ impl<'a, C> CatalogTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8679,13 +8485,15 @@ impl<'a, C> CatalogTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8951,25 +8759,15 @@ impl<'a, C> CatalogUndeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8977,13 +8775,15 @@ impl<'a, C> CatalogUndeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9257,25 +9057,15 @@ impl<'a, C> OperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9283,13 +9073,15 @@ impl<'a, C> OperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9536,25 +9328,15 @@ impl<'a, C> OperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9562,13 +9344,15 @@ impl<'a, C> OperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9805,25 +9589,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9831,13 +9605,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10074,25 +9850,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10100,13 +9866,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/cloudprivatecatalogproducer1_beta1/src/client.rs b/gen/cloudprivatecatalogproducer1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/cloudprivatecatalogproducer1_beta1/src/client.rs +++ b/gen/cloudprivatecatalogproducer1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/cloudprofiler2/src/api.rs b/gen/cloudprofiler2/src/api.rs index 4d9c3fc592..6b68bb6db3 100644 --- a/gen/cloudprofiler2/src/api.rs +++ b/gen/cloudprofiler2/src/api.rs @@ -521,25 +521,15 @@ impl<'a, C> ProjectProfileCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -547,13 +537,15 @@ impl<'a, C> ProjectProfileCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -818,25 +810,15 @@ impl<'a, C> ProjectProfileCreateOfflineCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -844,13 +826,15 @@ impl<'a, C> ProjectProfileCreateOfflineCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1120,25 +1104,15 @@ impl<'a, C> ProjectProfilePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1146,13 +1120,15 @@ impl<'a, C> ProjectProfilePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/cloudprofiler2/src/client.rs b/gen/cloudprofiler2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/cloudprofiler2/src/client.rs +++ b/gen/cloudprofiler2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/cloudresourcemanager1-cli/src/main.rs b/gen/cloudresourcemanager1-cli/src/main.rs index fd3fbf07c4..4eaf1472e4 100644 --- a/gen/cloudresourcemanager1-cli/src/main.rs +++ b/gen/cloudresourcemanager1-cli/src/main.rs @@ -786,7 +786,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "parent"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "parent"].iter().map(|v|*v)); v } )); } } @@ -2439,7 +2439,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/cloudresourcemanager1/src/api.rs b/gen/cloudresourcemanager1/src/api.rs index b42aaf323a..1a189a907c 100644 --- a/gen/cloudresourcemanager1/src/api.rs +++ b/gen/cloudresourcemanager1/src/api.rs @@ -2145,25 +2145,15 @@ impl<'a, C> FolderClearOrgPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2171,13 +2161,15 @@ impl<'a, C> FolderClearOrgPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2442,25 +2434,15 @@ impl<'a, C> FolderGetEffectiveOrgPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2468,13 +2450,15 @@ impl<'a, C> FolderGetEffectiveOrgPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2739,25 +2723,15 @@ impl<'a, C> FolderGetOrgPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2765,13 +2739,15 @@ impl<'a, C> FolderGetOrgPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3036,25 +3012,15 @@ impl<'a, C> FolderListAvailableOrgPolicyConstraintCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3062,13 +3028,15 @@ impl<'a, C> FolderListAvailableOrgPolicyConstraintCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3333,25 +3301,15 @@ impl<'a, C> FolderListOrgPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3359,13 +3317,15 @@ impl<'a, C> FolderListOrgPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3630,25 +3590,15 @@ impl<'a, C> FolderSetOrgPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3656,13 +3606,15 @@ impl<'a, C> FolderSetOrgPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3900,25 +3852,15 @@ impl<'a, C> LienCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3926,13 +3868,15 @@ impl<'a, C> LienCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4166,25 +4110,15 @@ impl<'a, C> LienDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4192,13 +4126,15 @@ impl<'a, C> LienDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4433,25 +4369,15 @@ impl<'a, C> LienGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4459,13 +4385,15 @@ impl<'a, C> LienGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4688,25 +4616,15 @@ impl<'a, C> LienListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4714,13 +4632,15 @@ impl<'a, C> LienListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4966,25 +4886,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4992,13 +4902,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5254,25 +5166,15 @@ impl<'a, C> OrganizationClearOrgPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5280,13 +5182,15 @@ impl<'a, C> OrganizationClearOrgPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5530,25 +5434,15 @@ impl<'a, C> OrganizationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5556,13 +5450,15 @@ impl<'a, C> OrganizationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5818,25 +5714,15 @@ impl<'a, C> OrganizationGetEffectiveOrgPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5844,13 +5730,15 @@ impl<'a, C> OrganizationGetEffectiveOrgPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6115,25 +6003,15 @@ impl<'a, C> OrganizationGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6141,13 +6019,15 @@ impl<'a, C> OrganizationGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6412,25 +6292,15 @@ impl<'a, C> OrganizationGetOrgPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6438,13 +6308,15 @@ impl<'a, C> OrganizationGetOrgPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6709,25 +6581,15 @@ impl<'a, C> OrganizationListAvailableOrgPolicyConstraintCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6735,13 +6597,15 @@ impl<'a, C> OrganizationListAvailableOrgPolicyConstraintCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7006,25 +6870,15 @@ impl<'a, C> OrganizationListOrgPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7032,13 +6886,15 @@ impl<'a, C> OrganizationListOrgPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7276,25 +7132,15 @@ impl<'a, C> OrganizationSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7302,13 +7148,15 @@ impl<'a, C> OrganizationSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7563,25 +7411,15 @@ impl<'a, C> OrganizationSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7589,13 +7427,15 @@ impl<'a, C> OrganizationSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7860,25 +7700,15 @@ impl<'a, C> OrganizationSetOrgPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7886,13 +7716,15 @@ impl<'a, C> OrganizationSetOrgPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8157,25 +7989,15 @@ impl<'a, C> OrganizationTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8183,13 +8005,15 @@ impl<'a, C> OrganizationTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8454,25 +8278,15 @@ impl<'a, C> ProjectClearOrgPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8480,13 +8294,15 @@ impl<'a, C> ProjectClearOrgPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8724,25 +8540,15 @@ impl<'a, C> ProjectCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8750,13 +8556,15 @@ impl<'a, C> ProjectCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8986,25 +8794,15 @@ impl<'a, C> ProjectDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9012,13 +8810,15 @@ impl<'a, C> ProjectDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9249,25 +9049,15 @@ impl<'a, C> ProjectGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9275,13 +9065,15 @@ impl<'a, C> ProjectGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9533,25 +9325,15 @@ impl<'a, C> ProjectGetAncestryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9559,13 +9341,15 @@ impl<'a, C> ProjectGetAncestryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9830,25 +9614,15 @@ impl<'a, C> ProjectGetEffectiveOrgPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9856,13 +9630,15 @@ impl<'a, C> ProjectGetEffectiveOrgPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10123,25 +9899,15 @@ impl<'a, C> ProjectGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10149,13 +9915,15 @@ impl<'a, C> ProjectGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10420,25 +10188,15 @@ impl<'a, C> ProjectGetOrgPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10446,13 +10204,15 @@ impl<'a, C> ProjectGetOrgPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10684,25 +10444,15 @@ impl<'a, C> ProjectListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10710,13 +10460,15 @@ impl<'a, C> ProjectListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10983,25 +10735,15 @@ impl<'a, C> ProjectListAvailableOrgPolicyConstraintCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11009,13 +10751,15 @@ impl<'a, C> ProjectListAvailableOrgPolicyConstraintCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11280,25 +11024,15 @@ impl<'a, C> ProjectListOrgPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11306,13 +11040,15 @@ impl<'a, C> ProjectListOrgPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11573,25 +11309,15 @@ impl<'a, C> ProjectSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11599,13 +11325,15 @@ impl<'a, C> ProjectSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11870,25 +11598,15 @@ impl<'a, C> ProjectSetOrgPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11896,13 +11614,15 @@ impl<'a, C> ProjectSetOrgPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12163,25 +11883,15 @@ impl<'a, C> ProjectTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12189,13 +11899,15 @@ impl<'a, C> ProjectTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12456,25 +12168,15 @@ impl<'a, C> ProjectUndeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12482,13 +12184,15 @@ impl<'a, C> ProjectUndeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12749,25 +12453,15 @@ impl<'a, C> ProjectUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12775,13 +12469,15 @@ impl<'a, C> ProjectUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/cloudresourcemanager1/src/client.rs b/gen/cloudresourcemanager1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/cloudresourcemanager1/src/client.rs +++ b/gen/cloudresourcemanager1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/cloudresourcemanager1_beta1-cli/src/main.rs b/gen/cloudresourcemanager1_beta1-cli/src/main.rs index 21073450a0..f19f1b2b46 100644 --- a/gen/cloudresourcemanager1_beta1-cli/src/main.rs +++ b/gen/cloudresourcemanager1_beta1-cli/src/main.rs @@ -211,7 +211,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -904,7 +904,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/cloudresourcemanager1_beta1/src/api.rs b/gen/cloudresourcemanager1_beta1/src/api.rs index c3ab7dbf9f..53a0432dd3 100644 --- a/gen/cloudresourcemanager1_beta1/src/api.rs +++ b/gen/cloudresourcemanager1_beta1/src/api.rs @@ -1127,25 +1127,15 @@ impl<'a, C> OrganizationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1153,13 +1143,15 @@ impl<'a, C> OrganizationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1422,25 +1414,15 @@ impl<'a, C> OrganizationGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1448,13 +1430,15 @@ impl<'a, C> OrganizationGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1686,25 +1670,15 @@ impl<'a, C> OrganizationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1712,13 +1686,15 @@ impl<'a, C> OrganizationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1985,25 +1961,15 @@ impl<'a, C> OrganizationSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2011,13 +1977,15 @@ impl<'a, C> OrganizationSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2282,25 +2250,15 @@ impl<'a, C> OrganizationTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2308,13 +2266,15 @@ impl<'a, C> OrganizationTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2579,25 +2539,15 @@ impl<'a, C> OrganizationUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2605,13 +2555,15 @@ impl<'a, C> OrganizationUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2854,25 +2806,15 @@ impl<'a, C> ProjectCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2880,13 +2822,15 @@ impl<'a, C> ProjectCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3123,25 +3067,15 @@ impl<'a, C> ProjectDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3149,13 +3083,15 @@ impl<'a, C> ProjectDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3386,25 +3322,15 @@ impl<'a, C> ProjectGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3412,13 +3338,15 @@ impl<'a, C> ProjectGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3670,25 +3598,15 @@ impl<'a, C> ProjectGetAncestryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3696,13 +3614,15 @@ impl<'a, C> ProjectGetAncestryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3963,25 +3883,15 @@ impl<'a, C> ProjectGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3989,13 +3899,15 @@ impl<'a, C> ProjectGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4227,25 +4139,15 @@ impl<'a, C> ProjectListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4253,13 +4155,15 @@ impl<'a, C> ProjectListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4522,25 +4426,15 @@ impl<'a, C> ProjectSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4548,13 +4442,15 @@ impl<'a, C> ProjectSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4815,25 +4711,15 @@ impl<'a, C> ProjectTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4841,13 +4727,15 @@ impl<'a, C> ProjectTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5108,25 +4996,15 @@ impl<'a, C> ProjectUndeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5134,13 +5012,15 @@ impl<'a, C> ProjectUndeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5401,25 +5281,15 @@ impl<'a, C> ProjectUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5427,13 +5297,15 @@ impl<'a, C> ProjectUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/cloudresourcemanager1_beta1/src/client.rs b/gen/cloudresourcemanager1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/cloudresourcemanager1_beta1/src/client.rs +++ b/gen/cloudresourcemanager1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/cloudresourcemanager2-cli/src/main.rs b/gen/cloudresourcemanager2-cli/src/main.rs index a1358c48a0..3d2640324c 100644 --- a/gen/cloudresourcemanager2-cli/src/main.rs +++ b/gen/cloudresourcemanager2-cli/src/main.rs @@ -355,7 +355,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["parent", "page-size", "page-token", "show-deleted"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "parent", "show-deleted"].iter().map(|v|*v)); v } )); } } diff --git a/gen/cloudresourcemanager2/src/api.rs b/gen/cloudresourcemanager2/src/api.rs index 59f2f5d194..84e750e413 100644 --- a/gen/cloudresourcemanager2/src/api.rs +++ b/gen/cloudresourcemanager2/src/api.rs @@ -996,25 +996,15 @@ impl<'a, C> FolderCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1022,13 +1012,15 @@ impl<'a, C> FolderCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1269,25 +1261,15 @@ impl<'a, C> FolderDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1295,13 +1277,15 @@ impl<'a, C> FolderDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1536,25 +1520,15 @@ impl<'a, C> FolderGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1562,13 +1536,15 @@ impl<'a, C> FolderGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1824,25 +1800,15 @@ impl<'a, C> FolderGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1850,13 +1816,15 @@ impl<'a, C> FolderGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2093,25 +2061,15 @@ impl<'a, C> FolderListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2119,13 +2077,15 @@ impl<'a, C> FolderListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2399,25 +2359,15 @@ impl<'a, C> FolderMoveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2425,13 +2375,15 @@ impl<'a, C> FolderMoveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2701,25 +2653,15 @@ impl<'a, C> FolderPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2727,13 +2669,15 @@ impl<'a, C> FolderPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2978,25 +2922,15 @@ impl<'a, C> FolderSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3004,13 +2938,15 @@ impl<'a, C> FolderSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3265,25 +3201,15 @@ impl<'a, C> FolderSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3291,13 +3217,15 @@ impl<'a, C> FolderSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3562,25 +3490,15 @@ impl<'a, C> FolderTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3588,13 +3506,15 @@ impl<'a, C> FolderTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3859,25 +3779,15 @@ impl<'a, C> FolderUndeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3885,13 +3795,15 @@ impl<'a, C> FolderUndeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4135,25 +4047,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4161,13 +4063,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/cloudresourcemanager2/src/client.rs b/gen/cloudresourcemanager2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/cloudresourcemanager2/src/client.rs +++ b/gen/cloudresourcemanager2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/cloudresourcemanager3-cli/src/main.rs b/gen/cloudresourcemanager3-cli/src/main.rs index 235e1d3778..d2b160df8f 100644 --- a/gen/cloudresourcemanager3-cli/src/main.rs +++ b/gen/cloudresourcemanager3-cli/src/main.rs @@ -354,7 +354,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["show-deleted", "parent", "page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "parent", "show-deleted"].iter().map(|v|*v)); v } )); } } @@ -597,7 +597,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "query", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "query"].iter().map(|v|*v)); v } )); } } @@ -1109,7 +1109,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["parent", "page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "parent"].iter().map(|v|*v)); v } )); } } @@ -1360,7 +1360,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "query", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "query"].iter().map(|v|*v)); v } )); } } @@ -1880,7 +1880,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["show-deleted", "parent", "page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "parent", "show-deleted"].iter().map(|v|*v)); v } )); } } @@ -2125,7 +2125,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "query", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "query"].iter().map(|v|*v)); v } )); } } @@ -2586,7 +2586,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["parent", "page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "parent"].iter().map(|v|*v)); v } )); } } @@ -2741,7 +2741,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["validate-only", "etag"].iter().map(|v|*v)); + v.extend(["etag", "validate-only"].iter().map(|v|*v)); v } )); } } @@ -2940,7 +2940,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["parent", "page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "parent"].iter().map(|v|*v)); v } )); } } @@ -3039,7 +3039,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["validate-only", "update-mask"].iter().map(|v|*v)); + v.extend(["update-mask", "validate-only"].iter().map(|v|*v)); v } )); } } @@ -3366,7 +3366,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["validate-only", "etag"].iter().map(|v|*v)); + v.extend(["etag", "validate-only"].iter().map(|v|*v)); v } )); } } @@ -3565,7 +3565,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["parent", "page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "parent"].iter().map(|v|*v)); v } )); } } @@ -3664,7 +3664,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["validate-only", "update-mask"].iter().map(|v|*v)); + v.extend(["update-mask", "validate-only"].iter().map(|v|*v)); v } )); } } diff --git a/gen/cloudresourcemanager3/src/api.rs b/gen/cloudresourcemanager3/src/api.rs index 37850cf472..cf35127d1f 100644 --- a/gen/cloudresourcemanager3/src/api.rs +++ b/gen/cloudresourcemanager3/src/api.rs @@ -2431,25 +2431,15 @@ impl<'a, C> FolderCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2457,13 +2447,15 @@ impl<'a, C> FolderCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2697,25 +2689,15 @@ impl<'a, C> FolderDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2723,13 +2705,15 @@ impl<'a, C> FolderDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2964,25 +2948,15 @@ impl<'a, C> FolderGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2990,13 +2964,15 @@ impl<'a, C> FolderGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3252,25 +3228,15 @@ impl<'a, C> FolderGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3278,13 +3244,15 @@ impl<'a, C> FolderGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3521,25 +3489,15 @@ impl<'a, C> FolderListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3547,13 +3505,15 @@ impl<'a, C> FolderListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3827,25 +3787,15 @@ impl<'a, C> FolderMoveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3853,13 +3803,15 @@ impl<'a, C> FolderMoveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4129,25 +4081,15 @@ impl<'a, C> FolderPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4155,13 +4097,15 @@ impl<'a, C> FolderPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4400,25 +4344,15 @@ impl<'a, C> FolderSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4426,13 +4360,15 @@ impl<'a, C> FolderSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4699,25 +4635,15 @@ impl<'a, C> FolderSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4725,13 +4651,15 @@ impl<'a, C> FolderSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4996,25 +4924,15 @@ impl<'a, C> FolderTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5022,13 +4940,15 @@ impl<'a, C> FolderTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5293,25 +5213,15 @@ impl<'a, C> FolderUndeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5319,13 +5229,15 @@ impl<'a, C> FolderUndeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5563,25 +5475,15 @@ impl<'a, C> LienCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5589,13 +5491,15 @@ impl<'a, C> LienCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5829,25 +5733,15 @@ impl<'a, C> LienDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5855,13 +5749,15 @@ impl<'a, C> LienDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6096,25 +5992,15 @@ impl<'a, C> LienGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6122,13 +6008,15 @@ impl<'a, C> LienGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6351,25 +6239,15 @@ impl<'a, C> LienListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6377,13 +6255,15 @@ impl<'a, C> LienListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6629,25 +6509,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6655,13 +6525,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6896,25 +6768,15 @@ impl<'a, C> OrganizationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6922,13 +6784,15 @@ impl<'a, C> OrganizationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7184,25 +7048,15 @@ impl<'a, C> OrganizationGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7210,13 +7064,15 @@ impl<'a, C> OrganizationGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7448,25 +7304,15 @@ impl<'a, C> OrganizationSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7474,13 +7320,15 @@ impl<'a, C> OrganizationSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7747,25 +7595,15 @@ impl<'a, C> OrganizationSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7773,13 +7611,15 @@ impl<'a, C> OrganizationSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8044,25 +7884,15 @@ impl<'a, C> OrganizationTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8070,13 +7900,15 @@ impl<'a, C> OrganizationTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8314,25 +8146,15 @@ impl<'a, C> ProjectCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8340,13 +8162,15 @@ impl<'a, C> ProjectCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8580,25 +8404,15 @@ impl<'a, C> ProjectDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8606,13 +8420,15 @@ impl<'a, C> ProjectDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8847,25 +8663,15 @@ impl<'a, C> ProjectGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8873,13 +8679,15 @@ impl<'a, C> ProjectGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9135,25 +8943,15 @@ impl<'a, C> ProjectGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9161,13 +8959,15 @@ impl<'a, C> ProjectGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9404,25 +9204,15 @@ impl<'a, C> ProjectListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9430,13 +9220,15 @@ impl<'a, C> ProjectListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9710,25 +9502,15 @@ impl<'a, C> ProjectMoveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9736,13 +9518,15 @@ impl<'a, C> ProjectMoveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10012,25 +9796,15 @@ impl<'a, C> ProjectPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10038,13 +9812,15 @@ impl<'a, C> ProjectPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10283,25 +10059,15 @@ impl<'a, C> ProjectSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10309,13 +10075,15 @@ impl<'a, C> ProjectSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10582,25 +10350,15 @@ impl<'a, C> ProjectSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10608,13 +10366,15 @@ impl<'a, C> ProjectSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10879,25 +10639,15 @@ impl<'a, C> ProjectTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10905,13 +10655,15 @@ impl<'a, C> ProjectTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11176,25 +10928,15 @@ impl<'a, C> ProjectUndeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11202,13 +10944,15 @@ impl<'a, C> ProjectUndeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11451,25 +11195,15 @@ impl<'a, C> TagBindingCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11477,13 +11211,15 @@ impl<'a, C> TagBindingCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11724,25 +11460,15 @@ impl<'a, C> TagBindingDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11750,13 +11476,15 @@ impl<'a, C> TagBindingDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11979,25 +11707,15 @@ impl<'a, C> TagBindingListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12005,13 +11723,15 @@ impl<'a, C> TagBindingListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12256,25 +11976,15 @@ impl<'a, C> TagKeyCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12282,13 +11992,15 @@ impl<'a, C> TagKeyCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12539,25 +12251,15 @@ impl<'a, C> TagKeyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12565,13 +12267,15 @@ impl<'a, C> TagKeyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12820,25 +12524,15 @@ impl<'a, C> TagKeyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12846,13 +12540,15 @@ impl<'a, C> TagKeyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13108,25 +12804,15 @@ impl<'a, C> TagKeyGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13134,13 +12820,15 @@ impl<'a, C> TagKeyGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13372,25 +13060,15 @@ impl<'a, C> TagKeyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13398,13 +13076,15 @@ impl<'a, C> TagKeyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13681,25 +13361,15 @@ impl<'a, C> TagKeyPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13707,13 +13377,15 @@ impl<'a, C> TagKeyPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13992,25 +13664,15 @@ impl<'a, C> TagKeySetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14018,13 +13680,15 @@ impl<'a, C> TagKeySetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14289,25 +13953,15 @@ impl<'a, C> TagKeyTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14315,13 +13969,15 @@ impl<'a, C> TagKeyTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14564,25 +14220,15 @@ impl<'a, C> TagValueCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14590,13 +14236,15 @@ impl<'a, C> TagValueCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14847,25 +14495,15 @@ impl<'a, C> TagValueDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14873,13 +14511,15 @@ impl<'a, C> TagValueDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15128,25 +14768,15 @@ impl<'a, C> TagValueGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15154,13 +14784,15 @@ impl<'a, C> TagValueGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15416,25 +15048,15 @@ impl<'a, C> TagValueGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15442,13 +15064,15 @@ impl<'a, C> TagValueGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15680,25 +15304,15 @@ impl<'a, C> TagValueListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15706,13 +15320,15 @@ impl<'a, C> TagValueListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15989,25 +15605,15 @@ impl<'a, C> TagValuePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16015,13 +15621,15 @@ impl<'a, C> TagValuePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16300,25 +15908,15 @@ impl<'a, C> TagValueSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16326,13 +15924,15 @@ impl<'a, C> TagValueSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16597,25 +16197,15 @@ impl<'a, C> TagValueTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16623,13 +16213,15 @@ impl<'a, C> TagValueTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/cloudresourcemanager3/src/client.rs b/gen/cloudresourcemanager3/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/cloudresourcemanager3/src/client.rs +++ b/gen/cloudresourcemanager3/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/cloudscheduler1-cli/src/main.rs b/gen/cloudscheduler1-cli/src/main.rs index 5460a915c2..9bfc5b1244 100644 --- a/gen/cloudscheduler1-cli/src/main.rs +++ b/gen/cloudscheduler1-cli/src/main.rs @@ -342,7 +342,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -779,7 +779,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/cloudscheduler1/src/api.rs b/gen/cloudscheduler1/src/api.rs index c71b134527..cf4e97d6be 100644 --- a/gen/cloudscheduler1/src/api.rs +++ b/gen/cloudscheduler1/src/api.rs @@ -920,25 +920,15 @@ impl<'a, C> ProjectLocationJobCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -946,13 +936,15 @@ impl<'a, C> ProjectLocationJobCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1196,25 +1188,15 @@ impl<'a, C> ProjectLocationJobDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1222,13 +1204,15 @@ impl<'a, C> ProjectLocationJobDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1463,25 +1447,15 @@ impl<'a, C> ProjectLocationJobGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1489,13 +1463,15 @@ impl<'a, C> ProjectLocationJobGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1740,25 +1716,15 @@ impl<'a, C> ProjectLocationJobListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1766,13 +1732,15 @@ impl<'a, C> ProjectLocationJobListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2047,25 +2015,15 @@ impl<'a, C> ProjectLocationJobPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2073,13 +2031,15 @@ impl<'a, C> ProjectLocationJobPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2351,25 +2311,15 @@ impl<'a, C> ProjectLocationJobPauseCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2377,13 +2327,15 @@ impl<'a, C> ProjectLocationJobPauseCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2648,25 +2600,15 @@ impl<'a, C> ProjectLocationJobResumeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2674,13 +2616,15 @@ impl<'a, C> ProjectLocationJobResumeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2945,25 +2889,15 @@ impl<'a, C> ProjectLocationJobRunCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2971,13 +2905,15 @@ impl<'a, C> ProjectLocationJobRunCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3221,25 +3157,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3247,13 +3173,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3503,25 +3431,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3529,13 +3447,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/cloudscheduler1/src/client.rs b/gen/cloudscheduler1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/cloudscheduler1/src/client.rs +++ b/gen/cloudscheduler1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/cloudscheduler1_beta1-cli/src/main.rs b/gen/cloudscheduler1_beta1-cli/src/main.rs index 915e2a3467..a8cc0412cb 100644 --- a/gen/cloudscheduler1_beta1-cli/src/main.rs +++ b/gen/cloudscheduler1_beta1-cli/src/main.rs @@ -789,7 +789,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/cloudscheduler1_beta1/src/api.rs b/gen/cloudscheduler1_beta1/src/api.rs index 151c24f5a6..6ba825e81d 100644 --- a/gen/cloudscheduler1_beta1/src/api.rs +++ b/gen/cloudscheduler1_beta1/src/api.rs @@ -929,25 +929,15 @@ impl<'a, C> ProjectLocationJobCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -955,13 +945,15 @@ impl<'a, C> ProjectLocationJobCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1210,25 +1202,15 @@ impl<'a, C> ProjectLocationJobDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1236,13 +1218,15 @@ impl<'a, C> ProjectLocationJobDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1484,25 +1468,15 @@ impl<'a, C> ProjectLocationJobGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1510,13 +1484,15 @@ impl<'a, C> ProjectLocationJobGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1766,25 +1742,15 @@ impl<'a, C> ProjectLocationJobListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1792,13 +1758,15 @@ impl<'a, C> ProjectLocationJobListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2080,25 +2048,15 @@ impl<'a, C> ProjectLocationJobPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2106,13 +2064,15 @@ impl<'a, C> ProjectLocationJobPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2384,25 +2344,15 @@ impl<'a, C> ProjectLocationJobPauseCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2410,13 +2360,15 @@ impl<'a, C> ProjectLocationJobPauseCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2681,25 +2633,15 @@ impl<'a, C> ProjectLocationJobResumeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2707,13 +2649,15 @@ impl<'a, C> ProjectLocationJobResumeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2978,25 +2922,15 @@ impl<'a, C> ProjectLocationJobRunCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3004,13 +2938,15 @@ impl<'a, C> ProjectLocationJobRunCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3254,25 +3190,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3280,13 +3206,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3536,25 +3464,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3562,13 +3480,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/cloudscheduler1_beta1/src/client.rs b/gen/cloudscheduler1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/cloudscheduler1_beta1/src/client.rs +++ b/gen/cloudscheduler1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/cloudshell1/src/api.rs b/gen/cloudshell1/src/api.rs index 2b1f100672..0f5989fca8 100644 --- a/gen/cloudshell1/src/api.rs +++ b/gen/cloudshell1/src/api.rs @@ -817,25 +817,15 @@ impl<'a, C> OperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -843,13 +833,15 @@ impl<'a, C> OperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1093,25 +1085,15 @@ impl<'a, C> OperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1119,13 +1101,15 @@ impl<'a, C> OperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1360,25 +1344,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1386,13 +1360,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1642,25 +1618,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1668,13 +1634,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1951,25 +1919,15 @@ impl<'a, C> UserEnvironmentAddPublicKeyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1977,13 +1935,15 @@ impl<'a, C> UserEnvironmentAddPublicKeyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2248,25 +2208,15 @@ impl<'a, C> UserEnvironmentAuthorizeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2274,13 +2224,15 @@ impl<'a, C> UserEnvironmentAuthorizeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2524,25 +2476,15 @@ impl<'a, C> UserEnvironmentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2550,13 +2492,15 @@ impl<'a, C> UserEnvironmentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2812,25 +2756,15 @@ impl<'a, C> UserEnvironmentRemovePublicKeyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2838,13 +2772,15 @@ impl<'a, C> UserEnvironmentRemovePublicKeyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3109,25 +3045,15 @@ impl<'a, C> UserEnvironmentStartCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3135,13 +3061,15 @@ impl<'a, C> UserEnvironmentStartCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/cloudshell1/src/client.rs b/gen/cloudshell1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/cloudshell1/src/client.rs +++ b/gen/cloudshell1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/cloudtasks2-cli/src/main.rs b/gen/cloudtasks2-cli/src/main.rs index 47d24482fa..e2959ebaad 100644 --- a/gen/cloudtasks2-cli/src/main.rs +++ b/gen/cloudtasks2-cli/src/main.rs @@ -122,7 +122,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -473,7 +473,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/cloudtasks2/src/api.rs b/gen/cloudtasks2/src/api.rs index 576570e44c..f5edab7603 100644 --- a/gen/cloudtasks2/src/api.rs +++ b/gen/cloudtasks2/src/api.rs @@ -1348,25 +1348,15 @@ impl<'a, C> ProjectLocationQueueTaskCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1374,13 +1364,15 @@ impl<'a, C> ProjectLocationQueueTaskCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1624,25 +1616,15 @@ impl<'a, C> ProjectLocationQueueTaskDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1650,13 +1632,15 @@ impl<'a, C> ProjectLocationQueueTaskDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1896,25 +1880,15 @@ impl<'a, C> ProjectLocationQueueTaskGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1922,13 +1896,15 @@ impl<'a, C> ProjectLocationQueueTaskGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2185,25 +2161,15 @@ impl<'a, C> ProjectLocationQueueTaskListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2211,13 +2177,15 @@ impl<'a, C> ProjectLocationQueueTaskListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2494,25 +2462,15 @@ impl<'a, C> ProjectLocationQueueTaskRunCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2520,13 +2478,15 @@ impl<'a, C> ProjectLocationQueueTaskRunCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2791,25 +2751,15 @@ impl<'a, C> ProjectLocationQueueCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2817,13 +2767,15 @@ impl<'a, C> ProjectLocationQueueCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3067,25 +3019,15 @@ impl<'a, C> ProjectLocationQueueDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3093,13 +3035,15 @@ impl<'a, C> ProjectLocationQueueDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3334,25 +3278,15 @@ impl<'a, C> ProjectLocationQueueGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3360,13 +3294,15 @@ impl<'a, C> ProjectLocationQueueGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3622,25 +3558,15 @@ impl<'a, C> ProjectLocationQueueGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3648,13 +3574,15 @@ impl<'a, C> ProjectLocationQueueGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3913,25 +3841,15 @@ impl<'a, C> ProjectLocationQueueListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3939,13 +3857,15 @@ impl<'a, C> ProjectLocationQueueListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4227,25 +4147,15 @@ impl<'a, C> ProjectLocationQueuePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4253,13 +4163,15 @@ impl<'a, C> ProjectLocationQueuePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4531,25 +4443,15 @@ impl<'a, C> ProjectLocationQueuePauseCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4557,13 +4459,15 @@ impl<'a, C> ProjectLocationQueuePauseCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4828,25 +4732,15 @@ impl<'a, C> ProjectLocationQueuePurgeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4854,13 +4748,15 @@ impl<'a, C> ProjectLocationQueuePurgeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5125,25 +5021,15 @@ impl<'a, C> ProjectLocationQueueResumeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5151,13 +5037,15 @@ impl<'a, C> ProjectLocationQueueResumeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5422,25 +5310,15 @@ impl<'a, C> ProjectLocationQueueSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5448,13 +5326,15 @@ impl<'a, C> ProjectLocationQueueSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5719,25 +5599,15 @@ impl<'a, C> ProjectLocationQueueTestIamPermissionCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5745,13 +5615,15 @@ impl<'a, C> ProjectLocationQueueTestIamPermissionCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5995,25 +5867,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6021,13 +5883,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6277,25 +6141,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6303,13 +6157,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/cloudtasks2/src/client.rs b/gen/cloudtasks2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/cloudtasks2/src/client.rs +++ b/gen/cloudtasks2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/cloudtasks2_beta2-cli/src/main.rs b/gen/cloudtasks2_beta2-cli/src/main.rs index 77ed8807ef..397e8df99e 100644 --- a/gen/cloudtasks2_beta2-cli/src/main.rs +++ b/gen/cloudtasks2_beta2-cli/src/main.rs @@ -122,7 +122,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -487,7 +487,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["read-mask", "page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token", "read-mask"].iter().map(|v|*v)); v } )); } } @@ -1476,7 +1476,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["response-view", "page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "response-view"].iter().map(|v|*v)); v } )); } } diff --git a/gen/cloudtasks2_beta2/src/api.rs b/gen/cloudtasks2_beta2/src/api.rs index 973b7c3149..2c278be7b4 100644 --- a/gen/cloudtasks2_beta2/src/api.rs +++ b/gen/cloudtasks2_beta2/src/api.rs @@ -1554,25 +1554,15 @@ impl<'a, C> ProjectLocationQueueTaskAcknowledgeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1580,13 +1570,15 @@ impl<'a, C> ProjectLocationQueueTaskAcknowledgeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1851,25 +1843,15 @@ impl<'a, C> ProjectLocationQueueTaskCancelLeaseCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1877,13 +1859,15 @@ impl<'a, C> ProjectLocationQueueTaskCancelLeaseCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2148,25 +2132,15 @@ impl<'a, C> ProjectLocationQueueTaskCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2174,13 +2148,15 @@ impl<'a, C> ProjectLocationQueueTaskCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2424,25 +2400,15 @@ impl<'a, C> ProjectLocationQueueTaskDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2450,13 +2416,15 @@ impl<'a, C> ProjectLocationQueueTaskDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2696,25 +2664,15 @@ impl<'a, C> ProjectLocationQueueTaskGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2722,13 +2680,15 @@ impl<'a, C> ProjectLocationQueueTaskGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2991,25 +2951,15 @@ impl<'a, C> ProjectLocationQueueTaskLeaseCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3017,13 +2967,15 @@ impl<'a, C> ProjectLocationQueueTaskLeaseCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3282,25 +3234,15 @@ impl<'a, C> ProjectLocationQueueTaskListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3308,13 +3250,15 @@ impl<'a, C> ProjectLocationQueueTaskListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3591,25 +3535,15 @@ impl<'a, C> ProjectLocationQueueTaskRenewLeaseCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3617,13 +3551,15 @@ impl<'a, C> ProjectLocationQueueTaskRenewLeaseCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3888,25 +3824,15 @@ impl<'a, C> ProjectLocationQueueTaskRunCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3914,13 +3840,15 @@ impl<'a, C> ProjectLocationQueueTaskRunCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4185,25 +4113,15 @@ impl<'a, C> ProjectLocationQueueCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4211,13 +4129,15 @@ impl<'a, C> ProjectLocationQueueCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4461,25 +4381,15 @@ impl<'a, C> ProjectLocationQueueDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4487,13 +4397,15 @@ impl<'a, C> ProjectLocationQueueDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4733,25 +4645,15 @@ impl<'a, C> ProjectLocationQueueGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4759,13 +4661,15 @@ impl<'a, C> ProjectLocationQueueGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5028,25 +4932,15 @@ impl<'a, C> ProjectLocationQueueGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5054,13 +4948,15 @@ impl<'a, C> ProjectLocationQueueGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5324,25 +5220,15 @@ impl<'a, C> ProjectLocationQueueListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5350,13 +5236,15 @@ impl<'a, C> ProjectLocationQueueListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5645,25 +5533,15 @@ impl<'a, C> ProjectLocationQueuePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5671,13 +5549,15 @@ impl<'a, C> ProjectLocationQueuePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5949,25 +5829,15 @@ impl<'a, C> ProjectLocationQueuePauseCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5975,13 +5845,15 @@ impl<'a, C> ProjectLocationQueuePauseCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6246,25 +6118,15 @@ impl<'a, C> ProjectLocationQueuePurgeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6272,13 +6134,15 @@ impl<'a, C> ProjectLocationQueuePurgeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6543,25 +6407,15 @@ impl<'a, C> ProjectLocationQueueResumeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6569,13 +6423,15 @@ impl<'a, C> ProjectLocationQueueResumeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6840,25 +6696,15 @@ impl<'a, C> ProjectLocationQueueSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6866,13 +6712,15 @@ impl<'a, C> ProjectLocationQueueSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7137,25 +6985,15 @@ impl<'a, C> ProjectLocationQueueTestIamPermissionCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7163,13 +7001,15 @@ impl<'a, C> ProjectLocationQueueTestIamPermissionCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7413,25 +7253,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7439,13 +7269,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7695,25 +7527,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7721,13 +7543,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/cloudtasks2_beta2/src/client.rs b/gen/cloudtasks2_beta2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/cloudtasks2_beta2/src/client.rs +++ b/gen/cloudtasks2_beta2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/cloudtasks2_beta3-cli/src/main.rs b/gen/cloudtasks2_beta3-cli/src/main.rs index dc1941d639..e5902d583a 100644 --- a/gen/cloudtasks2_beta3-cli/src/main.rs +++ b/gen/cloudtasks2_beta3-cli/src/main.rs @@ -122,7 +122,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -488,7 +488,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["read-mask", "page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token", "read-mask"].iter().map(|v|*v)); v } )); } } diff --git a/gen/cloudtasks2_beta3/src/api.rs b/gen/cloudtasks2_beta3/src/api.rs index 2b42197d4b..d60c983d32 100644 --- a/gen/cloudtasks2_beta3/src/api.rs +++ b/gen/cloudtasks2_beta3/src/api.rs @@ -1419,25 +1419,15 @@ impl<'a, C> ProjectLocationQueueTaskCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1445,13 +1435,15 @@ impl<'a, C> ProjectLocationQueueTaskCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1695,25 +1687,15 @@ impl<'a, C> ProjectLocationQueueTaskDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1721,13 +1703,15 @@ impl<'a, C> ProjectLocationQueueTaskDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1967,25 +1951,15 @@ impl<'a, C> ProjectLocationQueueTaskGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1993,13 +1967,15 @@ impl<'a, C> ProjectLocationQueueTaskGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2256,25 +2232,15 @@ impl<'a, C> ProjectLocationQueueTaskListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2282,13 +2248,15 @@ impl<'a, C> ProjectLocationQueueTaskListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2565,25 +2533,15 @@ impl<'a, C> ProjectLocationQueueTaskRunCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2591,13 +2549,15 @@ impl<'a, C> ProjectLocationQueueTaskRunCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2862,25 +2822,15 @@ impl<'a, C> ProjectLocationQueueCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2888,13 +2838,15 @@ impl<'a, C> ProjectLocationQueueCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3138,25 +3090,15 @@ impl<'a, C> ProjectLocationQueueDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3164,13 +3106,15 @@ impl<'a, C> ProjectLocationQueueDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3410,25 +3354,15 @@ impl<'a, C> ProjectLocationQueueGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3436,13 +3370,15 @@ impl<'a, C> ProjectLocationQueueGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3705,25 +3641,15 @@ impl<'a, C> ProjectLocationQueueGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3731,13 +3657,15 @@ impl<'a, C> ProjectLocationQueueGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4001,25 +3929,15 @@ impl<'a, C> ProjectLocationQueueListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4027,13 +3945,15 @@ impl<'a, C> ProjectLocationQueueListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4322,25 +4242,15 @@ impl<'a, C> ProjectLocationQueuePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4348,13 +4258,15 @@ impl<'a, C> ProjectLocationQueuePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4626,25 +4538,15 @@ impl<'a, C> ProjectLocationQueuePauseCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4652,13 +4554,15 @@ impl<'a, C> ProjectLocationQueuePauseCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4923,25 +4827,15 @@ impl<'a, C> ProjectLocationQueuePurgeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4949,13 +4843,15 @@ impl<'a, C> ProjectLocationQueuePurgeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5220,25 +5116,15 @@ impl<'a, C> ProjectLocationQueueResumeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5246,13 +5132,15 @@ impl<'a, C> ProjectLocationQueueResumeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5517,25 +5405,15 @@ impl<'a, C> ProjectLocationQueueSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5543,13 +5421,15 @@ impl<'a, C> ProjectLocationQueueSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5814,25 +5694,15 @@ impl<'a, C> ProjectLocationQueueTestIamPermissionCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5840,13 +5710,15 @@ impl<'a, C> ProjectLocationQueueTestIamPermissionCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6090,25 +5962,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6116,13 +5978,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6372,25 +6236,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6398,13 +6252,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/cloudtasks2_beta3/src/client.rs b/gen/cloudtasks2_beta3/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/cloudtasks2_beta3/src/client.rs +++ b/gen/cloudtasks2_beta3/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/cloudtrace1-cli/src/main.rs b/gen/cloudtrace1-cli/src/main.rs index 2ed0bae4c3..fcb3191635 100644 --- a/gen/cloudtrace1-cli/src/main.rs +++ b/gen/cloudtrace1-cli/src/main.rs @@ -218,7 +218,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["view", "order-by", "page-token", "page-size", "start-time", "end-time", "filter"].iter().map(|v|*v)); + v.extend(["end-time", "filter", "order-by", "page-size", "page-token", "start-time", "view"].iter().map(|v|*v)); v } )); } } diff --git a/gen/cloudtrace1/src/api.rs b/gen/cloudtrace1/src/api.rs index 06ec01ae46..073194e9da 100644 --- a/gen/cloudtrace1/src/api.rs +++ b/gen/cloudtrace1/src/api.rs @@ -530,25 +530,15 @@ impl<'a, C> ProjectTraceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -556,13 +546,15 @@ impl<'a, C> ProjectTraceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -838,25 +830,15 @@ impl<'a, C> ProjectTraceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -864,13 +846,15 @@ impl<'a, C> ProjectTraceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1171,25 +1155,15 @@ impl<'a, C> ProjectPatchTraceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1197,13 +1171,15 @@ impl<'a, C> ProjectPatchTraceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/cloudtrace1/src/client.rs b/gen/cloudtrace1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/cloudtrace1/src/client.rs +++ b/gen/cloudtrace1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/cloudtrace2/src/api.rs b/gen/cloudtrace2/src/api.rs index 99142921b2..82f7cd63b9 100644 --- a/gen/cloudtrace2/src/api.rs +++ b/gen/cloudtrace2/src/api.rs @@ -776,25 +776,15 @@ impl<'a, C> ProjectTraceSpanCreateSpanCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -802,13 +792,15 @@ impl<'a, C> ProjectTraceSpanCreateSpanCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1073,25 +1065,15 @@ impl<'a, C> ProjectTraceBatchWriteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1099,13 +1081,15 @@ impl<'a, C> ProjectTraceBatchWriteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/cloudtrace2/src/client.rs b/gen/cloudtrace2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/cloudtrace2/src/client.rs +++ b/gen/cloudtrace2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/clouduseraccountsvm_beta-cli/src/main.rs b/gen/clouduseraccountsvm_beta-cli/src/main.rs index 4f11dfefd9..83b67f6131 100644 --- a/gen/clouduseraccountsvm_beta-cli/src/main.rs +++ b/gen/clouduseraccountsvm_beta-cli/src/main.rs @@ -169,7 +169,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "order-by", "max-results"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token"].iter().map(|v|*v)); v } )); } } @@ -514,7 +514,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "order-by", "max-results"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token"].iter().map(|v|*v)); v } )); } } @@ -720,7 +720,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "order-by", "max-results"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1070,7 +1070,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "order-by", "max-results"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/clouduseraccountsvm_beta/src/api.rs b/gen/clouduseraccountsvm_beta/src/api.rs index cf931d0621..99a9b768dd 100644 --- a/gen/clouduseraccountsvm_beta/src/api.rs +++ b/gen/clouduseraccountsvm_beta/src/api.rs @@ -1349,25 +1349,15 @@ impl<'a, C> GlobalAccountsOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1375,11 +1365,11 @@ impl<'a, C> GlobalAccountsOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -1612,25 +1602,15 @@ impl<'a, C> GlobalAccountsOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1638,13 +1618,15 @@ impl<'a, C> GlobalAccountsOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1901,25 +1883,15 @@ impl<'a, C> GlobalAccountsOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1927,13 +1899,15 @@ impl<'a, C> GlobalAccountsOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2223,25 +2197,15 @@ impl<'a, C> GroupAddMemberCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2249,13 +2213,15 @@ impl<'a, C> GroupAddMemberCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2503,25 +2469,15 @@ impl<'a, C> GroupDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2529,13 +2485,15 @@ impl<'a, C> GroupDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2774,25 +2732,15 @@ impl<'a, C> GroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2800,13 +2748,15 @@ impl<'a, C> GroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3064,25 +3014,15 @@ impl<'a, C> GroupInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3090,13 +3030,15 @@ impl<'a, C> GroupInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3352,25 +3294,15 @@ impl<'a, C> GroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3378,13 +3310,15 @@ impl<'a, C> GroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3674,25 +3608,15 @@ impl<'a, C> GroupRemoveMemberCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3700,13 +3624,15 @@ impl<'a, C> GroupRemoveMemberCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3963,25 +3889,15 @@ impl<'a, C> LinuxGetAuthorizedKeysViewCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3989,13 +3905,15 @@ impl<'a, C> LinuxGetAuthorizedKeysViewCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4283,25 +4201,15 @@ impl<'a, C> LinuxGetLinuxAccountViewCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4309,13 +4217,15 @@ impl<'a, C> LinuxGetLinuxAccountViewCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4625,25 +4535,15 @@ impl<'a, C> UserAddPublicKeyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4651,13 +4551,15 @@ impl<'a, C> UserAddPublicKeyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4905,25 +4807,15 @@ impl<'a, C> UserDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4931,13 +4823,15 @@ impl<'a, C> UserDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5176,25 +5070,15 @@ impl<'a, C> UserGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5202,13 +5086,15 @@ impl<'a, C> UserGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5466,25 +5352,15 @@ impl<'a, C> UserInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5492,13 +5368,15 @@ impl<'a, C> UserInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5754,25 +5632,15 @@ impl<'a, C> UserListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5780,13 +5648,15 @@ impl<'a, C> UserListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6057,25 +5927,15 @@ impl<'a, C> UserRemovePublicKeyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6083,13 +5943,15 @@ impl<'a, C> UserRemovePublicKeyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/clouduseraccountsvm_beta/src/client.rs b/gen/clouduseraccountsvm_beta/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/clouduseraccountsvm_beta/src/client.rs +++ b/gen/clouduseraccountsvm_beta/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/commentanalyzer1_alpha1/src/api.rs b/gen/commentanalyzer1_alpha1/src/api.rs index 74a680ec60..7c3e186824 100644 --- a/gen/commentanalyzer1_alpha1/src/api.rs +++ b/gen/commentanalyzer1_alpha1/src/api.rs @@ -708,25 +708,15 @@ impl<'a, C> CommentAnalyzeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -734,13 +724,15 @@ impl<'a, C> CommentAnalyzeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -968,25 +960,15 @@ impl<'a, C> CommentSuggestscoreCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -994,13 +976,15 @@ impl<'a, C> CommentSuggestscoreCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/commentanalyzer1_alpha1/src/client.rs b/gen/commentanalyzer1_alpha1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/commentanalyzer1_alpha1/src/client.rs +++ b/gen/commentanalyzer1_alpha1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/composer1-cli/src/main.rs b/gen/composer1-cli/src/main.rs index d5f8393133..2e11fac681 100644 --- a/gen/composer1-cli/src/main.rs +++ b/gen/composer1-cli/src/main.rs @@ -293,7 +293,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -481,7 +481,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["include-past-releases", "page-token", "page-size"].iter().map(|v|*v)); + v.extend(["include-past-releases", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -647,7 +647,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "page-token", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/composer1/src/api.rs b/gen/composer1/src/api.rs index 7d6ece1bd6..0d228d3bf0 100644 --- a/gen/composer1/src/api.rs +++ b/gen/composer1/src/api.rs @@ -1002,25 +1002,15 @@ impl<'a, C> ProjectLocationEnvironmentCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1028,13 +1018,15 @@ impl<'a, C> ProjectLocationEnvironmentCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1278,25 +1270,15 @@ impl<'a, C> ProjectLocationEnvironmentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1304,13 +1286,15 @@ impl<'a, C> ProjectLocationEnvironmentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1545,25 +1529,15 @@ impl<'a, C> ProjectLocationEnvironmentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1571,13 +1545,15 @@ impl<'a, C> ProjectLocationEnvironmentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1822,25 +1798,15 @@ impl<'a, C> ProjectLocationEnvironmentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1848,13 +1814,15 @@ impl<'a, C> ProjectLocationEnvironmentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2129,25 +2097,15 @@ impl<'a, C> ProjectLocationEnvironmentPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2155,13 +2113,15 @@ impl<'a, C> ProjectLocationEnvironmentPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2427,25 +2387,15 @@ impl<'a, C> ProjectLocationImageVersionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2453,13 +2403,15 @@ impl<'a, C> ProjectLocationImageVersionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2715,25 +2667,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2741,13 +2683,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2982,25 +2926,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3008,13 +2942,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3264,25 +3200,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3290,13 +3216,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/composer1/src/client.rs b/gen/composer1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/composer1/src/client.rs +++ b/gen/composer1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/compute1-cli/src/main.rs b/gen/compute1-cli/src/main.rs index cd90297340..63165c9e38 100644 --- a/gen/compute1-cli/src/main.rs +++ b/gen/compute1-cli/src/main.rs @@ -79,7 +79,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -199,7 +199,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -270,7 +270,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -551,7 +551,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -622,7 +622,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -908,7 +908,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -1562,7 +1562,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -1935,7 +1935,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -2414,7 +2414,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -2898,7 +2898,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -3018,7 +3018,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -3178,7 +3178,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -3598,7 +3598,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["source-image", "request-id"].iter().map(|v|*v)); + v.extend(["request-id", "source-image"].iter().map(|v|*v)); v } )); } } @@ -3666,7 +3666,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -4380,7 +4380,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -4808,7 +4808,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["source-firewall-policy", "request-id"].iter().map(|v|*v)); + v.extend(["request-id", "source-firewall-policy"].iter().map(|v|*v)); v } )); } } @@ -5258,7 +5258,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["parent-id", "page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "parent-id", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -6151,7 +6151,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -6434,7 +6434,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -6725,7 +6725,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -7300,7 +7300,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -7591,7 +7591,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -8343,7 +8343,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -8411,7 +8411,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -8482,7 +8482,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -8646,7 +8646,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -8873,7 +8873,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["parent-id", "page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "parent-id", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -9149,7 +9149,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -9320,7 +9320,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -9634,7 +9634,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -10187,7 +10187,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -10666,7 +10666,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -11385,7 +11385,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -11941,7 +11941,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -12594,7 +12594,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -12662,7 +12662,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -12730,7 +12730,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -12798,7 +12798,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -13585,7 +13585,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -13861,7 +13861,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -13962,7 +13962,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -14491,7 +14491,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -14919,7 +14919,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -15848,7 +15848,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["source-instance-template", "request-id"].iter().map(|v|*v)); + v.extend(["request-id", "source-instance-template"].iter().map(|v|*v)); v } )); } } @@ -15916,7 +15916,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -15984,7 +15984,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -18059,7 +18059,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -18288,7 +18288,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["validate-only", "request-id"].iter().map(|v|*v)); + v.extend(["request-id", "validate-only"].iter().map(|v|*v)); v } )); } } @@ -18356,7 +18356,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -18594,7 +18594,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -18930,7 +18930,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -19506,7 +19506,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -19750,7 +19750,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -19870,7 +19870,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -19941,7 +19941,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -20403,7 +20403,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -20504,7 +20504,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -21019,7 +21019,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -21096,7 +21096,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["region", "page-token", "return-partial-success", "filter", "direction", "max-results", "peering-name", "order-by"].iter().map(|v|*v)); + v.extend(["direction", "filter", "max-results", "order-by", "page-token", "peering-name", "region", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -21600,7 +21600,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -22029,7 +22029,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -22097,7 +22097,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -22537,7 +22537,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -22873,7 +22873,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -23117,7 +23117,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -23237,7 +23237,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -23308,7 +23308,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -23589,7 +23589,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -24243,7 +24243,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -24344,7 +24344,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -25068,7 +25068,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -25238,7 +25238,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -25514,7 +25514,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -25900,7 +25900,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -26549,7 +26549,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -26944,7 +26944,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -27168,7 +27168,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -27288,7 +27288,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -27794,7 +27794,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["source-image", "request-id"].iter().map(|v|*v)); + v.extend(["request-id", "source-image"].iter().map(|v|*v)); v } )); } } @@ -27862,7 +27862,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -28579,7 +28579,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -28993,7 +28993,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -30011,7 +30011,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -30079,7 +30079,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -30147,7 +30147,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -30215,7 +30215,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -30963,7 +30963,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -31065,7 +31065,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -31557,7 +31557,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -31834,7 +31834,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -31998,7 +31998,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -32331,7 +32331,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -32605,7 +32605,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -32973,7 +32973,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -33456,7 +33456,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -33959,7 +33959,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -34030,7 +34030,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -34366,7 +34366,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -34699,7 +34699,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -35049,7 +35049,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -35293,7 +35293,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -35469,7 +35469,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -35689,7 +35689,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -36266,7 +36266,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -36688,7 +36688,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -36756,7 +36756,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -37238,7 +37238,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -37568,7 +37568,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -37849,7 +37849,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -38124,7 +38124,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -38192,7 +38192,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -38362,7 +38362,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -38795,7 +38795,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -38863,7 +38863,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -39514,7 +39514,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -39683,7 +39683,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -39957,7 +39957,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -40215,7 +40215,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -40494,7 +40494,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -41024,7 +41024,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -41297,7 +41297,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -41544,7 +41544,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -41905,7 +41905,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -42447,7 +42447,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -43076,7 +43076,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -43325,7 +43325,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -43600,7 +43600,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -43671,7 +43671,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -44066,7 +44066,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -44520,7 +44520,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -44846,7 +44846,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -45092,7 +45092,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "include-all-scopes", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "include-all-scopes", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -45378,7 +45378,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -45542,7 +45542,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } @@ -45714,7 +45714,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-partial-success", "filter", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token", "return-partial-success"].iter().map(|v|*v)); v } )); } } diff --git a/gen/compute1/src/api.rs b/gen/compute1/src/api.rs index 11e5daa58f..cce28d750f 100644 --- a/gen/compute1/src/api.rs +++ b/gen/compute1/src/api.rs @@ -38738,25 +38738,15 @@ impl<'a, C> AcceleratorTypeAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38764,13 +38754,15 @@ impl<'a, C> AcceleratorTypeAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39053,25 +39045,15 @@ impl<'a, C> AcceleratorTypeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39079,13 +39061,15 @@ impl<'a, C> AcceleratorTypeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39359,25 +39343,15 @@ impl<'a, C> AcceleratorTypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39385,13 +39359,15 @@ impl<'a, C> AcceleratorTypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39703,25 +39679,15 @@ impl<'a, C> AddresseAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39729,13 +39695,15 @@ impl<'a, C> AddresseAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40023,25 +39991,15 @@ impl<'a, C> AddresseDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40049,13 +40007,15 @@ impl<'a, C> AddresseDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40317,25 +40277,15 @@ impl<'a, C> AddresseGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40343,13 +40293,15 @@ impl<'a, C> AddresseGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40624,25 +40576,15 @@ impl<'a, C> AddresseInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40650,13 +40592,15 @@ impl<'a, C> AddresseInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40940,25 +40884,15 @@ impl<'a, C> AddresseListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40966,13 +40900,15 @@ impl<'a, C> AddresseListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41284,25 +41220,15 @@ impl<'a, C> AutoscalerAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41310,13 +41236,15 @@ impl<'a, C> AutoscalerAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41604,25 +41532,15 @@ impl<'a, C> AutoscalerDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41630,13 +41548,15 @@ impl<'a, C> AutoscalerDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41898,25 +41818,15 @@ impl<'a, C> AutoscalerGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41924,13 +41834,15 @@ impl<'a, C> AutoscalerGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42205,25 +42117,15 @@ impl<'a, C> AutoscalerInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42231,13 +42133,15 @@ impl<'a, C> AutoscalerInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42521,25 +42425,15 @@ impl<'a, C> AutoscalerListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42547,13 +42441,15 @@ impl<'a, C> AutoscalerListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42868,25 +42764,15 @@ impl<'a, C> AutoscalerPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42894,13 +42780,15 @@ impl<'a, C> AutoscalerPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43197,25 +43085,15 @@ impl<'a, C> AutoscalerUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43223,13 +43101,15 @@ impl<'a, C> AutoscalerUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43521,25 +43401,15 @@ impl<'a, C> BackendBucketAddSignedUrlKeyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43547,13 +43417,15 @@ impl<'a, C> BackendBucketAddSignedUrlKeyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43817,25 +43689,15 @@ impl<'a, C> BackendBucketDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43843,13 +43705,15 @@ impl<'a, C> BackendBucketDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44106,25 +43970,15 @@ impl<'a, C> BackendBucketDeleteSignedUrlKeyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44132,13 +43986,15 @@ impl<'a, C> BackendBucketDeleteSignedUrlKeyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44398,25 +44254,15 @@ impl<'a, C> BackendBucketGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44424,13 +44270,15 @@ impl<'a, C> BackendBucketGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44693,25 +44541,15 @@ impl<'a, C> BackendBucketInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44719,13 +44557,15 @@ impl<'a, C> BackendBucketInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44997,25 +44837,15 @@ impl<'a, C> BackendBucketListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45023,13 +44853,15 @@ impl<'a, C> BackendBucketListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45329,25 +45161,15 @@ impl<'a, C> BackendBucketPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45355,13 +45177,15 @@ impl<'a, C> BackendBucketPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45646,25 +45470,15 @@ impl<'a, C> BackendBucketUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45672,13 +45486,15 @@ impl<'a, C> BackendBucketUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45963,25 +45779,15 @@ impl<'a, C> BackendServiceAddSignedUrlKeyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45989,13 +45795,15 @@ impl<'a, C> BackendServiceAddSignedUrlKeyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46282,25 +46090,15 @@ impl<'a, C> BackendServiceAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46308,13 +46106,15 @@ impl<'a, C> BackendServiceAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46600,25 +46400,15 @@ impl<'a, C> BackendServiceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46626,13 +46416,15 @@ impl<'a, C> BackendServiceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46889,25 +46681,15 @@ impl<'a, C> BackendServiceDeleteSignedUrlKeyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46915,13 +46697,15 @@ impl<'a, C> BackendServiceDeleteSignedUrlKeyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47181,25 +46965,15 @@ impl<'a, C> BackendServiceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47207,13 +46981,15 @@ impl<'a, C> BackendServiceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47477,25 +47253,15 @@ impl<'a, C> BackendServiceGetHealthCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47503,13 +47269,15 @@ impl<'a, C> BackendServiceGetHealthCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47780,25 +47548,15 @@ impl<'a, C> BackendServiceInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47806,13 +47564,15 @@ impl<'a, C> BackendServiceInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -48084,25 +47844,15 @@ impl<'a, C> BackendServiceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -48110,13 +47860,15 @@ impl<'a, C> BackendServiceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -48416,25 +48168,15 @@ impl<'a, C> BackendServicePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -48442,13 +48184,15 @@ impl<'a, C> BackendServicePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -48733,25 +48477,15 @@ impl<'a, C> BackendServiceSetSecurityPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -48759,13 +48493,15 @@ impl<'a, C> BackendServiceSetSecurityPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49050,25 +48786,15 @@ impl<'a, C> BackendServiceUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -49076,13 +48802,15 @@ impl<'a, C> BackendServiceUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49369,25 +49097,15 @@ impl<'a, C> DiskTypeAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -49395,13 +49113,15 @@ impl<'a, C> DiskTypeAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49684,25 +49404,15 @@ impl<'a, C> DiskTypeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -49710,13 +49420,15 @@ impl<'a, C> DiskTypeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49990,25 +49702,15 @@ impl<'a, C> DiskTypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -50016,13 +49718,15 @@ impl<'a, C> DiskTypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -50334,25 +50038,15 @@ impl<'a, C> DiskAddResourcePolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -50360,13 +50054,15 @@ impl<'a, C> DiskAddResourcePolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -50663,25 +50359,15 @@ impl<'a, C> DiskAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -50689,13 +50375,15 @@ impl<'a, C> DiskAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51009,25 +50697,15 @@ impl<'a, C> DiskCreateSnapshotCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51035,13 +50713,15 @@ impl<'a, C> DiskCreateSnapshotCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51324,25 +51004,15 @@ impl<'a, C> DiskDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51350,13 +51020,15 @@ impl<'a, C> DiskDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51618,25 +51290,15 @@ impl<'a, C> DiskGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51644,13 +51306,15 @@ impl<'a, C> DiskGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51906,25 +51570,15 @@ impl<'a, C> DiskGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51932,13 +51586,15 @@ impl<'a, C> DiskGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -52225,25 +51881,15 @@ impl<'a, C> DiskInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -52251,13 +51897,15 @@ impl<'a, C> DiskInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -52548,25 +52196,15 @@ impl<'a, C> DiskListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -52574,13 +52212,15 @@ impl<'a, C> DiskListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -52892,25 +52532,15 @@ impl<'a, C> DiskRemoveResourcePolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -52918,13 +52548,15 @@ impl<'a, C> DiskRemoveResourcePolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -53221,25 +52853,15 @@ impl<'a, C> DiskResizeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -53247,13 +52869,15 @@ impl<'a, C> DiskResizeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -53545,25 +53169,15 @@ impl<'a, C> DiskSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -53571,13 +53185,15 @@ impl<'a, C> DiskSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -53863,25 +53479,15 @@ impl<'a, C> DiskSetLabelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -53889,13 +53495,15 @@ impl<'a, C> DiskSetLabelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -54187,25 +53795,15 @@ impl<'a, C> DiskTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -54213,13 +53811,15 @@ impl<'a, C> DiskTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -54482,25 +54082,15 @@ impl<'a, C> ExternalVpnGatewayDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -54508,13 +54098,15 @@ impl<'a, C> ExternalVpnGatewayDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -54764,25 +54356,15 @@ impl<'a, C> ExternalVpnGatewayGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -54790,13 +54372,15 @@ impl<'a, C> ExternalVpnGatewayGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -55059,25 +54643,15 @@ impl<'a, C> ExternalVpnGatewayInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -55085,13 +54659,15 @@ impl<'a, C> ExternalVpnGatewayInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -55363,25 +54939,15 @@ impl<'a, C> ExternalVpnGatewayListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -55389,13 +54955,15 @@ impl<'a, C> ExternalVpnGatewayListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -55690,25 +55258,15 @@ impl<'a, C> ExternalVpnGatewaySetLabelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -55716,13 +55274,15 @@ impl<'a, C> ExternalVpnGatewaySetLabelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -55991,25 +55551,15 @@ impl<'a, C> ExternalVpnGatewayTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -56017,13 +55567,15 @@ impl<'a, C> ExternalVpnGatewayTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -56300,25 +55852,15 @@ impl<'a, C> FirewallPolicyAddAssociationCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -56326,13 +55868,15 @@ impl<'a, C> FirewallPolicyAddAssociationCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -56612,25 +56156,15 @@ impl<'a, C> FirewallPolicyAddRuleCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -56638,13 +56172,15 @@ impl<'a, C> FirewallPolicyAddRuleCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -56901,25 +56437,15 @@ impl<'a, C> FirewallPolicyCloneRuleCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -56927,13 +56453,15 @@ impl<'a, C> FirewallPolicyCloneRuleCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -57183,25 +56711,15 @@ impl<'a, C> FirewallPolicyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -57209,13 +56727,15 @@ impl<'a, C> FirewallPolicyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -57453,25 +56973,15 @@ impl<'a, C> FirewallPolicyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -57479,13 +56989,15 @@ impl<'a, C> FirewallPolicyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -57717,25 +57229,15 @@ impl<'a, C> FirewallPolicyGetAssociationCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -57743,13 +57245,15 @@ impl<'a, C> FirewallPolicyGetAssociationCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -57988,25 +57492,15 @@ impl<'a, C> FirewallPolicyGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -58014,13 +57508,15 @@ impl<'a, C> FirewallPolicyGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -58259,25 +57755,15 @@ impl<'a, C> FirewallPolicyGetRuleCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -58285,13 +57771,15 @@ impl<'a, C> FirewallPolicyGetRuleCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -58533,25 +58021,15 @@ impl<'a, C> FirewallPolicyInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -58559,13 +58037,15 @@ impl<'a, C> FirewallPolicyInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -58816,25 +58296,15 @@ impl<'a, C> FirewallPolicyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -58842,13 +58312,15 @@ impl<'a, C> FirewallPolicyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -59099,25 +58571,15 @@ impl<'a, C> FirewallPolicyListAssociationCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -59125,13 +58587,15 @@ impl<'a, C> FirewallPolicyListAssociationCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -59365,25 +58829,15 @@ impl<'a, C> FirewallPolicyMoveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -59391,13 +58845,15 @@ impl<'a, C> FirewallPolicyMoveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -59668,25 +59124,15 @@ impl<'a, C> FirewallPolicyPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -59694,13 +59140,15 @@ impl<'a, C> FirewallPolicyPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -59978,25 +59426,15 @@ impl<'a, C> FirewallPolicyPatchRuleCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -60004,13 +59442,15 @@ impl<'a, C> FirewallPolicyPatchRuleCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -60274,25 +59714,15 @@ impl<'a, C> FirewallPolicyRemoveAssociationCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -60300,13 +59730,15 @@ impl<'a, C> FirewallPolicyRemoveAssociationCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -60561,25 +59993,15 @@ impl<'a, C> FirewallPolicyRemoveRuleCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -60587,13 +60009,15 @@ impl<'a, C> FirewallPolicyRemoveRuleCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -60859,25 +60283,15 @@ impl<'a, C> FirewallPolicySetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -60885,13 +60299,15 @@ impl<'a, C> FirewallPolicySetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -61148,25 +60564,15 @@ impl<'a, C> FirewallPolicyTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -61174,13 +60580,15 @@ impl<'a, C> FirewallPolicyTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -61423,25 +60831,15 @@ impl<'a, C> FirewallDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -61449,13 +60847,15 @@ impl<'a, C> FirewallDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -61705,25 +61105,15 @@ impl<'a, C> FirewallGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -61731,13 +61121,15 @@ impl<'a, C> FirewallGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -62000,25 +61392,15 @@ impl<'a, C> FirewallInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -62026,13 +61408,15 @@ impl<'a, C> FirewallInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -62304,25 +61688,15 @@ impl<'a, C> FirewallListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -62330,13 +61704,15 @@ impl<'a, C> FirewallListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -62636,25 +62012,15 @@ impl<'a, C> FirewallPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -62662,13 +62028,15 @@ impl<'a, C> FirewallPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -62953,25 +62321,15 @@ impl<'a, C> FirewallUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -62979,13 +62337,15 @@ impl<'a, C> FirewallUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -63272,25 +62632,15 @@ impl<'a, C> ForwardingRuleAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -63298,13 +62648,15 @@ impl<'a, C> ForwardingRuleAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -63592,25 +62944,15 @@ impl<'a, C> ForwardingRuleDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -63618,13 +62960,15 @@ impl<'a, C> ForwardingRuleDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -63886,25 +63230,15 @@ impl<'a, C> ForwardingRuleGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -63912,13 +63246,15 @@ impl<'a, C> ForwardingRuleGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -64193,25 +63529,15 @@ impl<'a, C> ForwardingRuleInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -64219,13 +63545,15 @@ impl<'a, C> ForwardingRuleInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -64509,25 +63837,15 @@ impl<'a, C> ForwardingRuleListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -64535,13 +63853,15 @@ impl<'a, C> ForwardingRuleListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -64853,25 +64173,15 @@ impl<'a, C> ForwardingRulePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -64879,13 +64189,15 @@ impl<'a, C> ForwardingRulePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -65182,25 +64494,15 @@ impl<'a, C> ForwardingRuleSetLabelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -65208,13 +64510,15 @@ impl<'a, C> ForwardingRuleSetLabelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -65511,25 +64815,15 @@ impl<'a, C> ForwardingRuleSetTargetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -65537,13 +64831,15 @@ impl<'a, C> ForwardingRuleSetTargetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -65817,25 +65113,15 @@ impl<'a, C> GlobalAddresseDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -65843,13 +65129,15 @@ impl<'a, C> GlobalAddresseDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -66099,25 +65387,15 @@ impl<'a, C> GlobalAddresseGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -66125,13 +65403,15 @@ impl<'a, C> GlobalAddresseGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -66394,25 +65674,15 @@ impl<'a, C> GlobalAddresseInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -66420,13 +65690,15 @@ impl<'a, C> GlobalAddresseInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -66698,25 +65970,15 @@ impl<'a, C> GlobalAddresseListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -66724,13 +65986,15 @@ impl<'a, C> GlobalAddresseListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -67009,25 +66273,15 @@ impl<'a, C> GlobalForwardingRuleDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -67035,13 +66289,15 @@ impl<'a, C> GlobalForwardingRuleDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -67291,25 +66547,15 @@ impl<'a, C> GlobalForwardingRuleGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -67317,13 +66563,15 @@ impl<'a, C> GlobalForwardingRuleGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -67586,25 +66834,15 @@ impl<'a, C> GlobalForwardingRuleInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -67612,13 +66850,15 @@ impl<'a, C> GlobalForwardingRuleInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -67890,25 +67130,15 @@ impl<'a, C> GlobalForwardingRuleListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -67916,13 +67146,15 @@ impl<'a, C> GlobalForwardingRuleListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -68222,25 +67454,15 @@ impl<'a, C> GlobalForwardingRulePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -68248,13 +67470,15 @@ impl<'a, C> GlobalForwardingRulePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -68534,25 +67758,15 @@ impl<'a, C> GlobalForwardingRuleSetLabelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -68560,13 +67774,15 @@ impl<'a, C> GlobalForwardingRuleSetLabelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -68840,25 +68056,15 @@ impl<'a, C> GlobalForwardingRuleSetTargetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -68866,13 +68072,15 @@ impl<'a, C> GlobalForwardingRuleSetTargetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -69157,25 +68365,15 @@ impl<'a, C> GlobalNetworkEndpointGroupAttachNetworkEndpointCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -69183,13 +68381,15 @@ impl<'a, C> GlobalNetworkEndpointGroupAttachNetworkEndpointCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -69453,25 +68653,15 @@ impl<'a, C> GlobalNetworkEndpointGroupDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -69479,13 +68669,15 @@ impl<'a, C> GlobalNetworkEndpointGroupDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -69761,25 +68953,15 @@ impl<'a, C> GlobalNetworkEndpointGroupDetachNetworkEndpointCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -69787,13 +68969,15 @@ impl<'a, C> GlobalNetworkEndpointGroupDetachNetworkEndpointCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -70052,25 +69236,15 @@ impl<'a, C> GlobalNetworkEndpointGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -70078,13 +69252,15 @@ impl<'a, C> GlobalNetworkEndpointGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -70347,25 +69523,15 @@ impl<'a, C> GlobalNetworkEndpointGroupInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -70373,13 +69539,15 @@ impl<'a, C> GlobalNetworkEndpointGroupInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -70651,25 +69819,15 @@ impl<'a, C> GlobalNetworkEndpointGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -70677,13 +69835,15 @@ impl<'a, C> GlobalNetworkEndpointGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -70982,25 +70142,15 @@ impl<'a, C> GlobalNetworkEndpointGroupListNetworkEndpointCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -71008,13 +70158,15 @@ impl<'a, C> GlobalNetworkEndpointGroupListNetworkEndpointCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -71326,25 +70478,15 @@ impl<'a, C> GlobalOperationAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -71352,13 +70494,15 @@ impl<'a, C> GlobalOperationAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -71638,25 +70782,15 @@ impl<'a, C> GlobalOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -71664,11 +70798,11 @@ impl<'a, C> GlobalOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -71901,25 +71035,15 @@ impl<'a, C> GlobalOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -71927,13 +71051,15 @@ impl<'a, C> GlobalOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -72195,25 +71321,15 @@ impl<'a, C> GlobalOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -72221,13 +71337,15 @@ impl<'a, C> GlobalOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -72505,25 +71623,15 @@ impl<'a, C> GlobalOperationWaitCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -72531,13 +71639,15 @@ impl<'a, C> GlobalOperationWaitCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -72778,25 +71888,15 @@ impl<'a, C> GlobalOrganizationOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -72804,11 +71904,11 @@ impl<'a, C> GlobalOrganizationOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -73041,25 +72141,15 @@ impl<'a, C> GlobalOrganizationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -73067,13 +72157,15 @@ impl<'a, C> GlobalOrganizationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -73314,25 +72406,15 @@ impl<'a, C> GlobalOrganizationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -73340,13 +72422,15 @@ impl<'a, C> GlobalOrganizationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -73622,25 +72706,15 @@ impl<'a, C> GlobalPublicDelegatedPrefixeDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -73648,13 +72722,15 @@ impl<'a, C> GlobalPublicDelegatedPrefixeDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -73904,25 +72980,15 @@ impl<'a, C> GlobalPublicDelegatedPrefixeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -73930,13 +72996,15 @@ impl<'a, C> GlobalPublicDelegatedPrefixeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -74199,25 +73267,15 @@ impl<'a, C> GlobalPublicDelegatedPrefixeInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -74225,13 +73283,15 @@ impl<'a, C> GlobalPublicDelegatedPrefixeInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -74503,25 +73563,15 @@ impl<'a, C> GlobalPublicDelegatedPrefixeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -74529,13 +73579,15 @@ impl<'a, C> GlobalPublicDelegatedPrefixeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -74835,25 +73887,15 @@ impl<'a, C> GlobalPublicDelegatedPrefixePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -74861,13 +73903,15 @@ impl<'a, C> GlobalPublicDelegatedPrefixePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -75154,25 +74198,15 @@ impl<'a, C> HealthCheckAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -75180,13 +74214,15 @@ impl<'a, C> HealthCheckAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -75472,25 +74508,15 @@ impl<'a, C> HealthCheckDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -75498,13 +74524,15 @@ impl<'a, C> HealthCheckDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -75754,25 +74782,15 @@ impl<'a, C> HealthCheckGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -75780,13 +74798,15 @@ impl<'a, C> HealthCheckGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -76049,25 +75069,15 @@ impl<'a, C> HealthCheckInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -76075,13 +75085,15 @@ impl<'a, C> HealthCheckInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -76353,25 +75365,15 @@ impl<'a, C> HealthCheckListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -76379,13 +75381,15 @@ impl<'a, C> HealthCheckListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -76685,25 +75689,15 @@ impl<'a, C> HealthCheckPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -76711,13 +75705,15 @@ impl<'a, C> HealthCheckPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -77002,25 +75998,15 @@ impl<'a, C> HealthCheckUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -77028,13 +76014,15 @@ impl<'a, C> HealthCheckUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -77298,25 +76286,15 @@ impl<'a, C> HttpHealthCheckDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -77324,13 +76302,15 @@ impl<'a, C> HttpHealthCheckDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -77580,25 +76560,15 @@ impl<'a, C> HttpHealthCheckGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -77606,13 +76576,15 @@ impl<'a, C> HttpHealthCheckGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -77875,25 +76847,15 @@ impl<'a, C> HttpHealthCheckInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -77901,13 +76863,15 @@ impl<'a, C> HttpHealthCheckInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -78179,25 +77143,15 @@ impl<'a, C> HttpHealthCheckListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -78205,13 +77159,15 @@ impl<'a, C> HttpHealthCheckListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -78511,25 +77467,15 @@ impl<'a, C> HttpHealthCheckPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -78537,13 +77483,15 @@ impl<'a, C> HttpHealthCheckPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -78828,25 +77776,15 @@ impl<'a, C> HttpHealthCheckUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -78854,13 +77792,15 @@ impl<'a, C> HttpHealthCheckUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -79124,25 +78064,15 @@ impl<'a, C> HttpsHealthCheckDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -79150,13 +78080,15 @@ impl<'a, C> HttpsHealthCheckDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -79406,25 +78338,15 @@ impl<'a, C> HttpsHealthCheckGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -79432,13 +78354,15 @@ impl<'a, C> HttpsHealthCheckGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -79701,25 +78625,15 @@ impl<'a, C> HttpsHealthCheckInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -79727,13 +78641,15 @@ impl<'a, C> HttpsHealthCheckInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -80005,25 +78921,15 @@ impl<'a, C> HttpsHealthCheckListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -80031,13 +78937,15 @@ impl<'a, C> HttpsHealthCheckListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -80337,25 +79245,15 @@ impl<'a, C> HttpsHealthCheckPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -80363,13 +79261,15 @@ impl<'a, C> HttpsHealthCheckPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -80654,25 +79554,15 @@ impl<'a, C> HttpsHealthCheckUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -80680,13 +79570,15 @@ impl<'a, C> HttpsHealthCheckUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -80950,25 +79842,15 @@ impl<'a, C> ImageDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -80976,13 +79858,15 @@ impl<'a, C> ImageDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -81260,25 +80144,15 @@ impl<'a, C> ImageDeprecateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -81286,13 +80160,15 @@ impl<'a, C> ImageDeprecateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -81551,25 +80427,15 @@ impl<'a, C> ImageGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -81577,13 +80443,15 @@ impl<'a, C> ImageGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -81822,25 +80690,15 @@ impl<'a, C> ImageGetFromFamilyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -81848,13 +80706,15 @@ impl<'a, C> ImageGetFromFamilyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -82098,25 +80958,15 @@ impl<'a, C> ImageGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -82124,13 +80974,15 @@ impl<'a, C> ImageGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -82405,25 +81257,15 @@ impl<'a, C> ImageInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -82431,13 +81273,15 @@ impl<'a, C> ImageInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -82716,25 +81560,15 @@ impl<'a, C> ImageListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -82742,13 +81576,15 @@ impl<'a, C> ImageListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -83048,25 +81884,15 @@ impl<'a, C> ImagePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -83074,13 +81900,15 @@ impl<'a, C> ImagePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -83360,25 +82188,15 @@ impl<'a, C> ImageSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -83386,13 +82204,15 @@ impl<'a, C> ImageSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -83661,25 +82481,15 @@ impl<'a, C> ImageSetLabelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -83687,13 +82497,15 @@ impl<'a, C> ImageSetLabelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -83962,25 +82774,15 @@ impl<'a, C> ImageTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -83988,13 +82790,15 @@ impl<'a, C> ImageTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -84274,25 +83078,15 @@ impl<'a, C> InstanceGroupManagerAbandonInstanceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -84300,13 +83094,15 @@ impl<'a, C> InstanceGroupManagerAbandonInstanceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -84603,25 +83399,15 @@ impl<'a, C> InstanceGroupManagerAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -84629,13 +83415,15 @@ impl<'a, C> InstanceGroupManagerAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -84939,25 +83727,15 @@ impl<'a, C> InstanceGroupManagerApplyUpdatesToInstanceCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -84965,13 +83743,15 @@ impl<'a, C> InstanceGroupManagerApplyUpdatesToInstanceCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -85257,25 +84037,15 @@ impl<'a, C> InstanceGroupManagerCreateInstanceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -85283,13 +84053,15 @@ impl<'a, C> InstanceGroupManagerCreateInstanceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -85565,25 +84337,15 @@ impl<'a, C> InstanceGroupManagerDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -85591,13 +84353,15 @@ impl<'a, C> InstanceGroupManagerDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -85889,25 +84653,15 @@ impl<'a, C> InstanceGroupManagerDeleteInstanceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -85915,13 +84669,15 @@ impl<'a, C> InstanceGroupManagerDeleteInstanceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -86213,25 +84969,15 @@ impl<'a, C> InstanceGroupManagerDeletePerInstanceConfigCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -86239,13 +84985,15 @@ impl<'a, C> InstanceGroupManagerDeletePerInstanceConfigCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -86505,25 +85253,15 @@ impl<'a, C> InstanceGroupManagerGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -86531,13 +85269,15 @@ impl<'a, C> InstanceGroupManagerGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -86814,25 +85554,15 @@ impl<'a, C> InstanceGroupManagerInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -86840,13 +85570,15 @@ impl<'a, C> InstanceGroupManagerInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -87130,25 +85862,15 @@ impl<'a, C> InstanceGroupManagerListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -87156,13 +85878,15 @@ impl<'a, C> InstanceGroupManagerListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -87473,25 +86197,15 @@ impl<'a, C> InstanceGroupManagerListErrorCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -87499,13 +86213,15 @@ impl<'a, C> InstanceGroupManagerListErrorCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -87826,25 +86542,15 @@ impl<'a, C> InstanceGroupManagerListManagedInstanceCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -87852,13 +86558,15 @@ impl<'a, C> InstanceGroupManagerListManagedInstanceCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -88179,25 +86887,15 @@ impl<'a, C> InstanceGroupManagerListPerInstanceConfigCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -88205,13 +86903,15 @@ impl<'a, C> InstanceGroupManagerListPerInstanceConfigCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -88533,25 +87233,15 @@ impl<'a, C> InstanceGroupManagerPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -88559,13 +87249,15 @@ impl<'a, C> InstanceGroupManagerPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -88862,25 +87554,15 @@ impl<'a, C> InstanceGroupManagerPatchPerInstanceConfigCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -88888,13 +87570,15 @@ impl<'a, C> InstanceGroupManagerPatchPerInstanceConfigCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -89195,25 +87879,15 @@ impl<'a, C> InstanceGroupManagerRecreateInstanceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -89221,13 +87895,15 @@ impl<'a, C> InstanceGroupManagerRecreateInstanceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -89513,25 +88189,15 @@ impl<'a, C> InstanceGroupManagerResizeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -89539,13 +88205,15 @@ impl<'a, C> InstanceGroupManagerResizeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -89843,25 +88511,15 @@ impl<'a, C> InstanceGroupManagerSetInstanceTemplateCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -89869,13 +88527,15 @@ impl<'a, C> InstanceGroupManagerSetInstanceTemplateCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -90172,25 +88832,15 @@ impl<'a, C> InstanceGroupManagerSetTargetPoolCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -90198,13 +88848,15 @@ impl<'a, C> InstanceGroupManagerSetTargetPoolCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -90501,25 +89153,15 @@ impl<'a, C> InstanceGroupManagerUpdatePerInstanceConfigCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -90527,13 +89169,15 @@ impl<'a, C> InstanceGroupManagerUpdatePerInstanceConfigCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -90830,25 +89474,15 @@ impl<'a, C> InstanceGroupAddInstanceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -90856,13 +89490,15 @@ impl<'a, C> InstanceGroupAddInstanceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -91159,25 +89795,15 @@ impl<'a, C> InstanceGroupAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -91185,13 +89811,15 @@ impl<'a, C> InstanceGroupAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -91479,25 +90107,15 @@ impl<'a, C> InstanceGroupDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -91505,13 +90123,15 @@ impl<'a, C> InstanceGroupDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -91775,25 +90395,15 @@ impl<'a, C> InstanceGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -91801,13 +90411,15 @@ impl<'a, C> InstanceGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -92082,25 +90694,15 @@ impl<'a, C> InstanceGroupInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -92108,13 +90710,15 @@ impl<'a, C> InstanceGroupInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -92400,25 +91004,15 @@ impl<'a, C> InstanceGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -92426,13 +91020,15 @@ impl<'a, C> InstanceGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -92764,25 +91360,15 @@ impl<'a, C> InstanceGroupListInstanceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -92790,13 +91376,15 @@ impl<'a, C> InstanceGroupListInstanceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -93129,25 +91717,15 @@ impl<'a, C> InstanceGroupRemoveInstanceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -93155,13 +91733,15 @@ impl<'a, C> InstanceGroupRemoveInstanceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -93458,25 +92038,15 @@ impl<'a, C> InstanceGroupSetNamedPortCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -93484,13 +92054,15 @@ impl<'a, C> InstanceGroupSetNamedPortCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -93764,25 +92336,15 @@ impl<'a, C> InstanceTemplateDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -93790,13 +92352,15 @@ impl<'a, C> InstanceTemplateDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -94046,25 +92610,15 @@ impl<'a, C> InstanceTemplateGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -94072,13 +92626,15 @@ impl<'a, C> InstanceTemplateGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -94322,25 +92878,15 @@ impl<'a, C> InstanceTemplateGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -94348,13 +92894,15 @@ impl<'a, C> InstanceTemplateGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -94624,25 +93172,15 @@ impl<'a, C> InstanceTemplateInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -94650,13 +93188,15 @@ impl<'a, C> InstanceTemplateInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -94928,25 +93468,15 @@ impl<'a, C> InstanceTemplateListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -94954,13 +93484,15 @@ impl<'a, C> InstanceTemplateListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -95255,25 +93787,15 @@ impl<'a, C> InstanceTemplateSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -95281,13 +93803,15 @@ impl<'a, C> InstanceTemplateSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -95556,25 +94080,15 @@ impl<'a, C> InstanceTemplateTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -95582,13 +94096,15 @@ impl<'a, C> InstanceTemplateTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -95866,25 +94382,15 @@ impl<'a, C> InstanceAddAccessConfigCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -95892,13 +94398,15 @@ impl<'a, C> InstanceAddAccessConfigCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -96205,25 +94713,15 @@ impl<'a, C> InstanceAddResourcePolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -96231,13 +94729,15 @@ impl<'a, C> InstanceAddResourcePolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -96534,25 +95034,15 @@ impl<'a, C> InstanceAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -96560,13 +95050,15 @@ impl<'a, C> InstanceAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -96880,25 +95372,15 @@ impl<'a, C> InstanceAttachDiskCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -96906,13 +95388,15 @@ impl<'a, C> InstanceAttachDiskCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -97214,25 +95698,15 @@ impl<'a, C> InstanceBulkInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -97240,13 +95714,15 @@ impl<'a, C> InstanceBulkInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -97512,25 +95988,15 @@ impl<'a, C> InstanceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -97538,13 +96004,15 @@ impl<'a, C> InstanceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -97815,25 +96283,15 @@ impl<'a, C> InstanceDeleteAccessConfigCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -97841,13 +96299,15 @@ impl<'a, C> InstanceDeleteAccessConfigCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -98136,25 +96596,15 @@ impl<'a, C> InstanceDetachDiskCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -98162,13 +96612,15 @@ impl<'a, C> InstanceDetachDiskCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -98440,25 +96892,15 @@ impl<'a, C> InstanceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -98466,13 +96908,15 @@ impl<'a, C> InstanceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -98725,25 +97169,15 @@ impl<'a, C> InstanceGetEffectiveFirewallCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -98751,13 +97185,15 @@ impl<'a, C> InstanceGetEffectiveFirewallCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -99028,25 +97464,15 @@ impl<'a, C> InstanceGetGuestAttributeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -99054,13 +97480,15 @@ impl<'a, C> InstanceGetGuestAttributeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -99330,25 +97758,15 @@ impl<'a, C> InstanceGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -99356,13 +97774,15 @@ impl<'a, C> InstanceGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -99620,25 +98040,15 @@ impl<'a, C> InstanceGetScreenshotCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -99646,13 +98056,15 @@ impl<'a, C> InstanceGetScreenshotCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -99913,25 +98325,15 @@ impl<'a, C> InstanceGetSerialPortOutputCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -99939,13 +98341,15 @@ impl<'a, C> InstanceGetSerialPortOutputCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -100214,25 +98618,15 @@ impl<'a, C> InstanceGetShieldedInstanceIdentityCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -100240,13 +98634,15 @@ impl<'a, C> InstanceGetShieldedInstanceIdentityCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -100526,25 +98922,15 @@ impl<'a, C> InstanceInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -100552,13 +98938,15 @@ impl<'a, C> InstanceInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -100854,25 +99242,15 @@ impl<'a, C> InstanceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -100880,13 +99258,15 @@ impl<'a, C> InstanceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -101197,25 +99577,15 @@ impl<'a, C> InstanceListReferrerCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -101223,13 +99593,15 @@ impl<'a, C> InstanceListReferrerCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -101551,25 +99923,15 @@ impl<'a, C> InstanceRemoveResourcePolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -101577,13 +99939,15 @@ impl<'a, C> InstanceRemoveResourcePolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -101859,25 +100223,15 @@ impl<'a, C> InstanceResetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -101885,13 +100239,15 @@ impl<'a, C> InstanceResetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -102163,25 +100519,15 @@ impl<'a, C> InstanceSetDeletionProtectionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -102189,13 +100535,15 @@ impl<'a, C> InstanceSetDeletionProtectionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -102473,25 +100821,15 @@ impl<'a, C> InstanceSetDiskAutoDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -102499,13 +100837,15 @@ impl<'a, C> InstanceSetDiskAutoDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -102808,25 +101148,15 @@ impl<'a, C> InstanceSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -102834,13 +101164,15 @@ impl<'a, C> InstanceSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -103126,25 +101458,15 @@ impl<'a, C> InstanceSetLabelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -103152,13 +101474,15 @@ impl<'a, C> InstanceSetLabelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -103455,25 +101779,15 @@ impl<'a, C> InstanceSetMachineResourceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -103481,13 +101795,15 @@ impl<'a, C> InstanceSetMachineResourceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -103784,25 +102100,15 @@ impl<'a, C> InstanceSetMachineTypeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -103810,13 +102116,15 @@ impl<'a, C> InstanceSetMachineTypeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -104113,25 +102421,15 @@ impl<'a, C> InstanceSetMetadataCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -104139,13 +102437,15 @@ impl<'a, C> InstanceSetMetadataCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -104442,25 +102742,15 @@ impl<'a, C> InstanceSetMinCpuPlatformCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -104468,13 +102758,15 @@ impl<'a, C> InstanceSetMinCpuPlatformCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -104771,25 +103063,15 @@ impl<'a, C> InstanceSetSchedulingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -104797,13 +103079,15 @@ impl<'a, C> InstanceSetSchedulingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -105100,25 +103384,15 @@ impl<'a, C> InstanceSetServiceAccountCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -105126,13 +103400,15 @@ impl<'a, C> InstanceSetServiceAccountCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -105429,25 +103705,15 @@ impl<'a, C> InstanceSetShieldedInstanceIntegrityPolicyCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -105455,13 +103721,15 @@ impl<'a, C> InstanceSetShieldedInstanceIntegrityPolicyCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -105758,25 +104026,15 @@ impl<'a, C> InstanceSetTagCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -105784,13 +104042,15 @@ impl<'a, C> InstanceSetTagCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -106061,25 +104321,15 @@ impl<'a, C> InstanceSimulateMaintenanceEventCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -106087,13 +104337,15 @@ impl<'a, C> InstanceSimulateMaintenanceEventCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -106349,25 +104601,15 @@ impl<'a, C> InstanceStartCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -106375,13 +104617,15 @@ impl<'a, C> InstanceStartCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -106669,25 +104913,15 @@ impl<'a, C> InstanceStartWithEncryptionKeyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -106695,13 +104929,15 @@ impl<'a, C> InstanceStartWithEncryptionKeyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -106977,25 +105213,15 @@ impl<'a, C> InstanceStopCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -107003,13 +105229,15 @@ impl<'a, C> InstanceStopCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -107292,25 +105520,15 @@ impl<'a, C> InstanceTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -107318,13 +105536,15 @@ impl<'a, C> InstanceTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -107620,25 +105840,15 @@ impl<'a, C> InstanceUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -107646,13 +105856,15 @@ impl<'a, C> InstanceUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -107965,25 +106177,15 @@ impl<'a, C> InstanceUpdateAccessConfigCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -107991,13 +106193,15 @@ impl<'a, C> InstanceUpdateAccessConfigCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -108304,25 +106508,15 @@ impl<'a, C> InstanceUpdateDisplayDeviceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -108330,13 +106524,15 @@ impl<'a, C> InstanceUpdateDisplayDeviceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -108635,25 +106831,15 @@ impl<'a, C> InstanceUpdateNetworkInterfaceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -108661,13 +106847,15 @@ impl<'a, C> InstanceUpdateNetworkInterfaceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -108974,25 +107162,15 @@ impl<'a, C> InstanceUpdateShieldedInstanceConfigCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -109000,13 +107178,15 @@ impl<'a, C> InstanceUpdateShieldedInstanceConfigCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -109303,25 +107483,15 @@ impl<'a, C> InterconnectAttachmentAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -109329,13 +107499,15 @@ impl<'a, C> InterconnectAttachmentAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -109623,25 +107795,15 @@ impl<'a, C> InterconnectAttachmentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -109649,13 +107811,15 @@ impl<'a, C> InterconnectAttachmentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -109917,25 +108081,15 @@ impl<'a, C> InterconnectAttachmentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -109943,13 +108097,15 @@ impl<'a, C> InterconnectAttachmentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -110229,25 +108385,15 @@ impl<'a, C> InterconnectAttachmentInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -110255,13 +108401,15 @@ impl<'a, C> InterconnectAttachmentInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -110552,25 +108700,15 @@ impl<'a, C> InterconnectAttachmentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -110578,13 +108716,15 @@ impl<'a, C> InterconnectAttachmentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -110896,25 +109036,15 @@ impl<'a, C> InterconnectAttachmentPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -110922,13 +109052,15 @@ impl<'a, C> InterconnectAttachmentPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -111197,25 +109329,15 @@ impl<'a, C> InterconnectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -111223,13 +109345,15 @@ impl<'a, C> InterconnectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -111491,25 +109615,15 @@ impl<'a, C> InterconnectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -111517,13 +109631,15 @@ impl<'a, C> InterconnectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -111802,25 +109918,15 @@ impl<'a, C> InterconnectDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -111828,13 +109934,15 @@ impl<'a, C> InterconnectDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -112084,25 +110192,15 @@ impl<'a, C> InterconnectGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -112110,13 +110208,15 @@ impl<'a, C> InterconnectGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -112355,25 +110455,15 @@ impl<'a, C> InterconnectGetDiagnosticCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -112381,13 +110471,15 @@ impl<'a, C> InterconnectGetDiagnosticCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -112650,25 +110742,15 @@ impl<'a, C> InterconnectInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -112676,13 +110758,15 @@ impl<'a, C> InterconnectInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -112954,25 +111038,15 @@ impl<'a, C> InterconnectListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -112980,13 +111054,15 @@ impl<'a, C> InterconnectListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -113286,25 +111362,15 @@ impl<'a, C> InterconnectPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -113312,13 +111378,15 @@ impl<'a, C> InterconnectPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -113577,25 +111645,15 @@ impl<'a, C> LicenseCodeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -113603,13 +111661,15 @@ impl<'a, C> LicenseCodeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -113869,25 +111929,15 @@ impl<'a, C> LicenseCodeTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -113895,13 +111945,15 @@ impl<'a, C> LicenseCodeTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -114154,25 +112206,15 @@ impl<'a, C> LicenseDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -114180,13 +112222,15 @@ impl<'a, C> LicenseDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -114436,25 +112480,15 @@ impl<'a, C> LicenseGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -114462,13 +112496,15 @@ impl<'a, C> LicenseGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -114712,25 +112748,15 @@ impl<'a, C> LicenseGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -114738,13 +112764,15 @@ impl<'a, C> LicenseGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -115014,25 +113042,15 @@ impl<'a, C> LicenseInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -115040,13 +113058,15 @@ impl<'a, C> LicenseInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -115318,25 +113338,15 @@ impl<'a, C> LicenseListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -115344,13 +113354,15 @@ impl<'a, C> LicenseListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -115645,25 +113657,15 @@ impl<'a, C> LicenseSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -115671,13 +113673,15 @@ impl<'a, C> LicenseSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -115946,25 +113950,15 @@ impl<'a, C> LicenseTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -115972,13 +113966,15 @@ impl<'a, C> LicenseTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -116254,25 +114250,15 @@ impl<'a, C> MachineTypeAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -116280,13 +114266,15 @@ impl<'a, C> MachineTypeAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -116569,25 +114557,15 @@ impl<'a, C> MachineTypeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -116595,13 +114573,15 @@ impl<'a, C> MachineTypeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -116875,25 +114855,15 @@ impl<'a, C> MachineTypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -116901,13 +114871,15 @@ impl<'a, C> MachineTypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -117219,25 +115191,15 @@ impl<'a, C> NetworkEndpointGroupAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -117245,13 +115207,15 @@ impl<'a, C> NetworkEndpointGroupAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -117560,25 +115524,15 @@ impl<'a, C> NetworkEndpointGroupAttachNetworkEndpointCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -117586,13 +115540,15 @@ impl<'a, C> NetworkEndpointGroupAttachNetworkEndpointCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -117868,25 +115824,15 @@ impl<'a, C> NetworkEndpointGroupDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -117894,13 +115840,15 @@ impl<'a, C> NetworkEndpointGroupDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -118188,25 +116136,15 @@ impl<'a, C> NetworkEndpointGroupDetachNetworkEndpointCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -118214,13 +116152,15 @@ impl<'a, C> NetworkEndpointGroupDetachNetworkEndpointCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -118491,25 +116431,15 @@ impl<'a, C> NetworkEndpointGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -118517,13 +116447,15 @@ impl<'a, C> NetworkEndpointGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -118798,25 +116730,15 @@ impl<'a, C> NetworkEndpointGroupInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -118824,13 +116746,15 @@ impl<'a, C> NetworkEndpointGroupInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -119114,25 +117038,15 @@ impl<'a, C> NetworkEndpointGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -119140,13 +117054,15 @@ impl<'a, C> NetworkEndpointGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -119478,25 +117394,15 @@ impl<'a, C> NetworkEndpointGroupListNetworkEndpointCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -119504,13 +117410,15 @@ impl<'a, C> NetworkEndpointGroupListNetworkEndpointCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -119836,25 +117744,15 @@ impl<'a, C> NetworkEndpointGroupTestIamPermissionCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -119862,13 +117760,15 @@ impl<'a, C> NetworkEndpointGroupTestIamPermissionCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -120152,25 +118052,15 @@ impl<'a, C> NetworkAddPeeringCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -120178,13 +118068,15 @@ impl<'a, C> NetworkAddPeeringCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -120448,25 +118340,15 @@ impl<'a, C> NetworkDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -120474,13 +118356,15 @@ impl<'a, C> NetworkDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -120730,25 +118614,15 @@ impl<'a, C> NetworkGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -120756,13 +118630,15 @@ impl<'a, C> NetworkGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -121001,25 +118877,15 @@ impl<'a, C> NetworkGetEffectiveFirewallCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -121027,13 +118893,15 @@ impl<'a, C> NetworkGetEffectiveFirewallCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -121296,25 +119164,15 @@ impl<'a, C> NetworkInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -121322,13 +119180,15 @@ impl<'a, C> NetworkInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -121600,25 +119460,15 @@ impl<'a, C> NetworkListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -121626,13 +119476,15 @@ impl<'a, C> NetworkListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -121946,25 +119798,15 @@ impl<'a, C> NetworkListPeeringRouteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -121972,13 +119814,15 @@ impl<'a, C> NetworkListPeeringRouteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -122309,25 +120153,15 @@ impl<'a, C> NetworkPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -122335,13 +120169,15 @@ impl<'a, C> NetworkPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -122626,25 +120462,15 @@ impl<'a, C> NetworkRemovePeeringCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -122652,13 +120478,15 @@ impl<'a, C> NetworkRemovePeeringCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -122922,25 +120750,15 @@ impl<'a, C> NetworkSwitchToCustomModeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -122948,13 +120766,15 @@ impl<'a, C> NetworkSwitchToCustomModeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -123230,25 +121050,15 @@ impl<'a, C> NetworkUpdatePeeringCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -123256,13 +121066,15 @@ impl<'a, C> NetworkUpdatePeeringCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -123549,25 +121361,15 @@ impl<'a, C> NodeGroupAddNodeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -123575,13 +121377,15 @@ impl<'a, C> NodeGroupAddNodeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -123878,25 +121682,15 @@ impl<'a, C> NodeGroupAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -123904,13 +121698,15 @@ impl<'a, C> NodeGroupAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -124198,25 +121994,15 @@ impl<'a, C> NodeGroupDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -124224,13 +122010,15 @@ impl<'a, C> NodeGroupDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -124518,25 +122306,15 @@ impl<'a, C> NodeGroupDeleteNodeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -124544,13 +122322,15 @@ impl<'a, C> NodeGroupDeleteNodeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -124821,25 +122601,15 @@ impl<'a, C> NodeGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -124847,13 +122617,15 @@ impl<'a, C> NodeGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -125109,25 +122881,15 @@ impl<'a, C> NodeGroupGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -125135,13 +122897,15 @@ impl<'a, C> NodeGroupGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -125425,25 +123189,15 @@ impl<'a, C> NodeGroupInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -125451,13 +123205,15 @@ impl<'a, C> NodeGroupInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -125751,25 +123507,15 @@ impl<'a, C> NodeGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -125777,13 +123523,15 @@ impl<'a, C> NodeGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -126094,25 +123842,15 @@ impl<'a, C> NodeGroupListNodeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -126120,13 +123858,15 @@ impl<'a, C> NodeGroupListNodeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -126448,25 +124188,15 @@ impl<'a, C> NodeGroupPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -126474,13 +124204,15 @@ impl<'a, C> NodeGroupPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -126772,25 +124504,15 @@ impl<'a, C> NodeGroupSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -126798,13 +124520,15 @@ impl<'a, C> NodeGroupSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -127090,25 +124814,15 @@ impl<'a, C> NodeGroupSetNodeTemplateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -127116,13 +124830,15 @@ impl<'a, C> NodeGroupSetNodeTemplateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -127414,25 +125130,15 @@ impl<'a, C> NodeGroupTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -127440,13 +125146,15 @@ impl<'a, C> NodeGroupTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -127732,25 +125440,15 @@ impl<'a, C> NodeTemplateAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -127758,13 +125456,15 @@ impl<'a, C> NodeTemplateAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -128052,25 +125752,15 @@ impl<'a, C> NodeTemplateDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -128078,13 +125768,15 @@ impl<'a, C> NodeTemplateDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -128346,25 +126038,15 @@ impl<'a, C> NodeTemplateGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -128372,13 +126054,15 @@ impl<'a, C> NodeTemplateGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -128634,25 +126318,15 @@ impl<'a, C> NodeTemplateGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -128660,13 +126334,15 @@ impl<'a, C> NodeTemplateGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -128948,25 +126624,15 @@ impl<'a, C> NodeTemplateInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -128974,13 +126640,15 @@ impl<'a, C> NodeTemplateInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -129264,25 +126932,15 @@ impl<'a, C> NodeTemplateListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -129290,13 +126948,15 @@ impl<'a, C> NodeTemplateListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -129603,25 +127263,15 @@ impl<'a, C> NodeTemplateSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -129629,13 +127279,15 @@ impl<'a, C> NodeTemplateSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -129916,25 +127568,15 @@ impl<'a, C> NodeTemplateTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -129942,13 +127584,15 @@ impl<'a, C> NodeTemplateTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -130234,25 +127878,15 @@ impl<'a, C> NodeTypeAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -130260,13 +127894,15 @@ impl<'a, C> NodeTypeAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -130549,25 +128185,15 @@ impl<'a, C> NodeTypeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -130575,13 +128201,15 @@ impl<'a, C> NodeTypeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -130855,25 +128483,15 @@ impl<'a, C> NodeTypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -130881,13 +128499,15 @@ impl<'a, C> NodeTypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -131199,25 +128819,15 @@ impl<'a, C> PacketMirroringAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -131225,13 +128835,15 @@ impl<'a, C> PacketMirroringAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -131519,25 +129131,15 @@ impl<'a, C> PacketMirroringDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -131545,13 +129147,15 @@ impl<'a, C> PacketMirroringDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -131813,25 +129417,15 @@ impl<'a, C> PacketMirroringGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -131839,13 +129433,15 @@ impl<'a, C> PacketMirroringGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -132120,25 +129716,15 @@ impl<'a, C> PacketMirroringInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -132146,13 +129732,15 @@ impl<'a, C> PacketMirroringInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -132436,25 +130024,15 @@ impl<'a, C> PacketMirroringListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -132462,13 +130040,15 @@ impl<'a, C> PacketMirroringListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -132780,25 +130360,15 @@ impl<'a, C> PacketMirroringPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -132806,13 +130376,15 @@ impl<'a, C> PacketMirroringPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -133104,25 +130676,15 @@ impl<'a, C> PacketMirroringTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -133130,13 +130692,15 @@ impl<'a, C> PacketMirroringTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -133397,25 +130961,15 @@ impl<'a, C> ProjectDisableXpnHostCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -133423,13 +130977,15 @@ impl<'a, C> ProjectDisableXpnHostCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -133693,25 +131249,15 @@ impl<'a, C> ProjectDisableXpnResourceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -133719,13 +131265,15 @@ impl<'a, C> ProjectDisableXpnResourceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -133977,25 +131525,15 @@ impl<'a, C> ProjectEnableXpnHostCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -134003,13 +131541,15 @@ impl<'a, C> ProjectEnableXpnHostCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -134273,25 +131813,15 @@ impl<'a, C> ProjectEnableXpnResourceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -134299,13 +131829,15 @@ impl<'a, C> ProjectEnableXpnResourceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -134552,25 +132084,15 @@ impl<'a, C> ProjectGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -134578,13 +132100,15 @@ impl<'a, C> ProjectGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -134811,25 +132335,15 @@ impl<'a, C> ProjectGetXpnHostCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -134837,13 +132351,15 @@ impl<'a, C> ProjectGetXpnHostCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -135095,25 +132611,15 @@ impl<'a, C> ProjectGetXpnResourceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -135121,13 +132627,15 @@ impl<'a, C> ProjectGetXpnResourceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -135445,25 +132953,15 @@ impl<'a, C> ProjectListXpnHostCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -135471,13 +132969,15 @@ impl<'a, C> ProjectListXpnHostCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -135784,25 +133284,15 @@ impl<'a, C> ProjectMoveDiskCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -135810,13 +133300,15 @@ impl<'a, C> ProjectMoveDiskCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -136089,25 +133581,15 @@ impl<'a, C> ProjectMoveInstanceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -136115,13 +133597,15 @@ impl<'a, C> ProjectMoveInstanceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -136394,25 +133878,15 @@ impl<'a, C> ProjectSetCommonInstanceMetadataCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -136420,13 +133894,15 @@ impl<'a, C> ProjectSetCommonInstanceMetadataCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -136699,25 +134175,15 @@ impl<'a, C> ProjectSetDefaultNetworkTierCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -136725,13 +134191,15 @@ impl<'a, C> ProjectSetDefaultNetworkTierCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -137004,25 +134472,15 @@ impl<'a, C> ProjectSetUsageExportBucketCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -137030,13 +134488,15 @@ impl<'a, C> ProjectSetUsageExportBucketCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -137290,25 +134750,15 @@ impl<'a, C> PublicAdvertisedPrefixeDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -137316,13 +134766,15 @@ impl<'a, C> PublicAdvertisedPrefixeDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -137572,25 +135024,15 @@ impl<'a, C> PublicAdvertisedPrefixeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -137598,13 +135040,15 @@ impl<'a, C> PublicAdvertisedPrefixeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -137867,25 +135311,15 @@ impl<'a, C> PublicAdvertisedPrefixeInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -137893,13 +135327,15 @@ impl<'a, C> PublicAdvertisedPrefixeInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -138171,25 +135607,15 @@ impl<'a, C> PublicAdvertisedPrefixeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -138197,13 +135623,15 @@ impl<'a, C> PublicAdvertisedPrefixeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -138503,25 +135931,15 @@ impl<'a, C> PublicAdvertisedPrefixePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -138529,13 +135947,15 @@ impl<'a, C> PublicAdvertisedPrefixePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -138822,25 +136242,15 @@ impl<'a, C> PublicDelegatedPrefixeAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -138848,13 +136258,15 @@ impl<'a, C> PublicDelegatedPrefixeAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -139142,25 +136554,15 @@ impl<'a, C> PublicDelegatedPrefixeDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -139168,13 +136570,15 @@ impl<'a, C> PublicDelegatedPrefixeDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -139436,25 +136840,15 @@ impl<'a, C> PublicDelegatedPrefixeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -139462,13 +136856,15 @@ impl<'a, C> PublicDelegatedPrefixeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -139743,25 +137139,15 @@ impl<'a, C> PublicDelegatedPrefixeInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -139769,13 +137155,15 @@ impl<'a, C> PublicDelegatedPrefixeInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -140059,25 +137447,15 @@ impl<'a, C> PublicDelegatedPrefixeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -140085,13 +137463,15 @@ impl<'a, C> PublicDelegatedPrefixeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -140403,25 +137783,15 @@ impl<'a, C> PublicDelegatedPrefixePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -140429,13 +137799,15 @@ impl<'a, C> PublicDelegatedPrefixePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -140711,25 +138083,15 @@ impl<'a, C> RegionAutoscalerDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -140737,13 +138099,15 @@ impl<'a, C> RegionAutoscalerDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -141005,25 +138369,15 @@ impl<'a, C> RegionAutoscalerGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -141031,13 +138385,15 @@ impl<'a, C> RegionAutoscalerGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -141312,25 +138668,15 @@ impl<'a, C> RegionAutoscalerInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -141338,13 +138684,15 @@ impl<'a, C> RegionAutoscalerInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -141628,25 +138976,15 @@ impl<'a, C> RegionAutoscalerListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -141654,13 +138992,15 @@ impl<'a, C> RegionAutoscalerListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -141975,25 +139315,15 @@ impl<'a, C> RegionAutoscalerPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -142001,13 +139331,15 @@ impl<'a, C> RegionAutoscalerPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -142304,25 +139636,15 @@ impl<'a, C> RegionAutoscalerUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -142330,13 +139652,15 @@ impl<'a, C> RegionAutoscalerUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -142609,25 +139933,15 @@ impl<'a, C> RegionBackendServiceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -142635,13 +139949,15 @@ impl<'a, C> RegionBackendServiceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -142903,25 +140219,15 @@ impl<'a, C> RegionBackendServiceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -142929,13 +140235,15 @@ impl<'a, C> RegionBackendServiceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -143207,25 +140515,15 @@ impl<'a, C> RegionBackendServiceGetHealthCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -143233,13 +140531,15 @@ impl<'a, C> RegionBackendServiceGetHealthCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -143522,25 +140822,15 @@ impl<'a, C> RegionBackendServiceInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -143548,13 +140838,15 @@ impl<'a, C> RegionBackendServiceInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -143838,25 +141130,15 @@ impl<'a, C> RegionBackendServiceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -143864,13 +141146,15 @@ impl<'a, C> RegionBackendServiceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -144182,25 +141466,15 @@ impl<'a, C> RegionBackendServicePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -144208,13 +141482,15 @@ impl<'a, C> RegionBackendServicePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -144511,25 +141787,15 @@ impl<'a, C> RegionBackendServiceUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -144537,13 +141803,15 @@ impl<'a, C> RegionBackendServiceUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -144840,25 +142108,15 @@ impl<'a, C> RegionCommitmentAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -144866,13 +142124,15 @@ impl<'a, C> RegionCommitmentAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -145155,25 +142415,15 @@ impl<'a, C> RegionCommitmentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -145181,13 +142431,15 @@ impl<'a, C> RegionCommitmentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -145462,25 +142714,15 @@ impl<'a, C> RegionCommitmentInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -145488,13 +142730,15 @@ impl<'a, C> RegionCommitmentInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -145778,25 +143022,15 @@ impl<'a, C> RegionCommitmentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -145804,13 +143038,15 @@ impl<'a, C> RegionCommitmentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -146096,25 +143332,15 @@ impl<'a, C> RegionDiskTypeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -146122,13 +143348,15 @@ impl<'a, C> RegionDiskTypeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -146402,25 +143630,15 @@ impl<'a, C> RegionDiskTypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -146428,13 +143646,15 @@ impl<'a, C> RegionDiskTypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -146746,25 +143966,15 @@ impl<'a, C> RegionDiskAddResourcePolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -146772,13 +143982,15 @@ impl<'a, C> RegionDiskAddResourcePolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -147075,25 +144287,15 @@ impl<'a, C> RegionDiskCreateSnapshotCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -147101,13 +144303,15 @@ impl<'a, C> RegionDiskCreateSnapshotCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -147383,25 +144587,15 @@ impl<'a, C> RegionDiskDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -147409,13 +144603,15 @@ impl<'a, C> RegionDiskDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -147677,25 +144873,15 @@ impl<'a, C> RegionDiskGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -147703,13 +144889,15 @@ impl<'a, C> RegionDiskGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -147965,25 +145153,15 @@ impl<'a, C> RegionDiskGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -147991,13 +145169,15 @@ impl<'a, C> RegionDiskGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -148284,25 +145464,15 @@ impl<'a, C> RegionDiskInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -148310,13 +145480,15 @@ impl<'a, C> RegionDiskInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -148607,25 +145779,15 @@ impl<'a, C> RegionDiskListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -148633,13 +145795,15 @@ impl<'a, C> RegionDiskListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -148951,25 +146115,15 @@ impl<'a, C> RegionDiskRemoveResourcePolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -148977,13 +146131,15 @@ impl<'a, C> RegionDiskRemoveResourcePolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -149280,25 +146436,15 @@ impl<'a, C> RegionDiskResizeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -149306,13 +146452,15 @@ impl<'a, C> RegionDiskResizeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -149604,25 +146752,15 @@ impl<'a, C> RegionDiskSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -149630,13 +146768,15 @@ impl<'a, C> RegionDiskSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -149922,25 +147062,15 @@ impl<'a, C> RegionDiskSetLabelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -149948,13 +147078,15 @@ impl<'a, C> RegionDiskSetLabelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -150246,25 +147378,15 @@ impl<'a, C> RegionDiskTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -150272,13 +147394,15 @@ impl<'a, C> RegionDiskTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -150543,25 +147667,15 @@ impl<'a, C> RegionHealthCheckServiceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -150569,13 +147683,15 @@ impl<'a, C> RegionHealthCheckServiceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -150837,25 +147953,15 @@ impl<'a, C> RegionHealthCheckServiceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -150863,13 +147969,15 @@ impl<'a, C> RegionHealthCheckServiceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -151144,25 +148252,15 @@ impl<'a, C> RegionHealthCheckServiceInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -151170,13 +148268,15 @@ impl<'a, C> RegionHealthCheckServiceInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -151460,25 +148560,15 @@ impl<'a, C> RegionHealthCheckServiceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -151486,13 +148576,15 @@ impl<'a, C> RegionHealthCheckServiceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -151804,25 +148896,15 @@ impl<'a, C> RegionHealthCheckServicePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -151830,13 +148912,15 @@ impl<'a, C> RegionHealthCheckServicePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -152112,25 +149196,15 @@ impl<'a, C> RegionHealthCheckDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -152138,13 +149212,15 @@ impl<'a, C> RegionHealthCheckDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -152406,25 +149482,15 @@ impl<'a, C> RegionHealthCheckGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -152432,13 +149498,15 @@ impl<'a, C> RegionHealthCheckGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -152713,25 +149781,15 @@ impl<'a, C> RegionHealthCheckInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -152739,13 +149797,15 @@ impl<'a, C> RegionHealthCheckInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -153029,25 +150089,15 @@ impl<'a, C> RegionHealthCheckListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -153055,13 +150105,15 @@ impl<'a, C> RegionHealthCheckListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -153373,25 +150425,15 @@ impl<'a, C> RegionHealthCheckPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -153399,13 +150441,15 @@ impl<'a, C> RegionHealthCheckPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -153702,25 +150746,15 @@ impl<'a, C> RegionHealthCheckUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -153728,13 +150762,15 @@ impl<'a, C> RegionHealthCheckUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -154035,25 +151071,15 @@ impl<'a, C> RegionInstanceGroupManagerAbandonInstanceCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -154061,13 +151087,15 @@ impl<'a, C> RegionInstanceGroupManagerAbandonInstanceCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -154359,25 +151387,15 @@ impl<'a, C> RegionInstanceGroupManagerApplyUpdatesToInstanceCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -154385,13 +151403,15 @@ impl<'a, C> RegionInstanceGroupManagerApplyUpdatesToInstanceCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -154677,25 +151697,15 @@ impl<'a, C> RegionInstanceGroupManagerCreateInstanceCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -154703,13 +151713,15 @@ impl<'a, C> RegionInstanceGroupManagerCreateInstanceCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -154985,25 +151997,15 @@ impl<'a, C> RegionInstanceGroupManagerDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -155011,13 +152013,15 @@ impl<'a, C> RegionInstanceGroupManagerDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -155309,25 +152313,15 @@ impl<'a, C> RegionInstanceGroupManagerDeleteInstanceCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -155335,13 +152329,15 @@ impl<'a, C> RegionInstanceGroupManagerDeleteInstanceCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -155633,25 +152629,15 @@ impl<'a, C> RegionInstanceGroupManagerDeletePerInstanceConfigCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -155659,13 +152645,15 @@ impl<'a, C> RegionInstanceGroupManagerDeletePerInstanceConfigCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -155925,25 +152913,15 @@ impl<'a, C> RegionInstanceGroupManagerGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -155951,13 +152929,15 @@ impl<'a, C> RegionInstanceGroupManagerGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -156234,25 +153214,15 @@ impl<'a, C> RegionInstanceGroupManagerInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -156260,13 +153230,15 @@ impl<'a, C> RegionInstanceGroupManagerInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -156550,25 +153522,15 @@ impl<'a, C> RegionInstanceGroupManagerListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -156576,13 +153538,15 @@ impl<'a, C> RegionInstanceGroupManagerListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -156893,25 +153857,15 @@ impl<'a, C> RegionInstanceGroupManagerListErrorCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -156919,13 +153873,15 @@ impl<'a, C> RegionInstanceGroupManagerListErrorCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -157246,25 +154202,15 @@ impl<'a, C> RegionInstanceGroupManagerListManagedInstanceCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -157272,13 +154218,15 @@ impl<'a, C> RegionInstanceGroupManagerListManagedInstanceCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -157599,25 +154547,15 @@ impl<'a, C> RegionInstanceGroupManagerListPerInstanceConfigCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -157625,13 +154563,15 @@ impl<'a, C> RegionInstanceGroupManagerListPerInstanceConfigCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -157953,25 +154893,15 @@ impl<'a, C> RegionInstanceGroupManagerPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -157979,13 +154909,15 @@ impl<'a, C> RegionInstanceGroupManagerPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -158282,25 +155214,15 @@ impl<'a, C> RegionInstanceGroupManagerPatchPerInstanceConfigCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -158308,13 +155230,15 @@ impl<'a, C> RegionInstanceGroupManagerPatchPerInstanceConfigCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -158615,25 +155539,15 @@ impl<'a, C> RegionInstanceGroupManagerRecreateInstanceCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -158641,13 +155555,15 @@ impl<'a, C> RegionInstanceGroupManagerRecreateInstanceCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -158929,25 +155845,15 @@ impl<'a, C> RegionInstanceGroupManagerResizeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -158955,13 +155861,15 @@ impl<'a, C> RegionInstanceGroupManagerResizeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -159259,25 +156167,15 @@ impl<'a, C> RegionInstanceGroupManagerSetInstanceTemplateCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -159285,13 +156183,15 @@ impl<'a, C> RegionInstanceGroupManagerSetInstanceTemplateCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -159588,25 +156488,15 @@ impl<'a, C> RegionInstanceGroupManagerSetTargetPoolCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -159614,13 +156504,15 @@ impl<'a, C> RegionInstanceGroupManagerSetTargetPoolCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -159917,25 +156809,15 @@ impl<'a, C> RegionInstanceGroupManagerUpdatePerInstanceConfigCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -159943,13 +156825,15 @@ impl<'a, C> RegionInstanceGroupManagerUpdatePerInstanceConfigCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -160220,25 +157104,15 @@ impl<'a, C> RegionInstanceGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -160246,13 +157120,15 @@ impl<'a, C> RegionInstanceGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -160526,25 +157402,15 @@ impl<'a, C> RegionInstanceGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -160552,13 +157418,15 @@ impl<'a, C> RegionInstanceGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -160890,25 +157758,15 @@ impl<'a, C> RegionInstanceGroupListInstanceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -160916,13 +157774,15 @@ impl<'a, C> RegionInstanceGroupListInstanceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -161253,25 +158113,15 @@ impl<'a, C> RegionInstanceGroupSetNamedPortCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -161279,13 +158129,15 @@ impl<'a, C> RegionInstanceGroupSetNamedPortCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -161580,25 +158432,15 @@ impl<'a, C> RegionInstanceBulkInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -161606,13 +158448,15 @@ impl<'a, C> RegionInstanceBulkInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -161878,25 +158722,15 @@ impl<'a, C> RegionNetworkEndpointGroupDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -161904,13 +158738,15 @@ impl<'a, C> RegionNetworkEndpointGroupDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -162172,25 +159008,15 @@ impl<'a, C> RegionNetworkEndpointGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -162198,13 +159024,15 @@ impl<'a, C> RegionNetworkEndpointGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -162479,25 +159307,15 @@ impl<'a, C> RegionNetworkEndpointGroupInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -162505,13 +159323,15 @@ impl<'a, C> RegionNetworkEndpointGroupInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -162795,25 +159615,15 @@ impl<'a, C> RegionNetworkEndpointGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -162821,13 +159631,15 @@ impl<'a, C> RegionNetworkEndpointGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -163118,25 +159930,15 @@ impl<'a, C> RegionNotificationEndpointDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -163144,13 +159946,15 @@ impl<'a, C> RegionNotificationEndpointDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -163412,25 +160216,15 @@ impl<'a, C> RegionNotificationEndpointGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -163438,13 +160232,15 @@ impl<'a, C> RegionNotificationEndpointGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -163719,25 +160515,15 @@ impl<'a, C> RegionNotificationEndpointInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -163745,13 +160531,15 @@ impl<'a, C> RegionNotificationEndpointInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -164035,25 +160823,15 @@ impl<'a, C> RegionNotificationEndpointListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -164061,13 +160839,15 @@ impl<'a, C> RegionNotificationEndpointListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -164352,25 +161132,15 @@ impl<'a, C> RegionOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -164378,11 +161148,11 @@ impl<'a, C> RegionOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -164627,25 +161397,15 @@ impl<'a, C> RegionOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -164653,13 +161413,15 @@ impl<'a, C> RegionOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -164933,25 +161695,15 @@ impl<'a, C> RegionOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -164959,13 +161711,15 @@ impl<'a, C> RegionOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -165255,25 +162009,15 @@ impl<'a, C> RegionOperationWaitCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -165281,13 +162025,15 @@ impl<'a, C> RegionOperationWaitCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -165543,25 +162289,15 @@ impl<'a, C> RegionSslCertificateDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -165569,13 +162305,15 @@ impl<'a, C> RegionSslCertificateDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -165837,25 +162575,15 @@ impl<'a, C> RegionSslCertificateGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -165863,13 +162591,15 @@ impl<'a, C> RegionSslCertificateGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -166144,25 +162874,15 @@ impl<'a, C> RegionSslCertificateInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -166170,13 +162890,15 @@ impl<'a, C> RegionSslCertificateInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -166460,25 +163182,15 @@ impl<'a, C> RegionSslCertificateListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -166486,13 +163198,15 @@ impl<'a, C> RegionSslCertificateListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -166783,25 +163497,15 @@ impl<'a, C> RegionTargetHttpProxyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -166809,13 +163513,15 @@ impl<'a, C> RegionTargetHttpProxyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -167077,25 +163783,15 @@ impl<'a, C> RegionTargetHttpProxyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -167103,13 +163799,15 @@ impl<'a, C> RegionTargetHttpProxyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -167384,25 +164082,15 @@ impl<'a, C> RegionTargetHttpProxyInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -167410,13 +164098,15 @@ impl<'a, C> RegionTargetHttpProxyInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -167700,25 +164390,15 @@ impl<'a, C> RegionTargetHttpProxyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -167726,13 +164406,15 @@ impl<'a, C> RegionTargetHttpProxyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -168044,25 +164726,15 @@ impl<'a, C> RegionTargetHttpProxySetUrlMapCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -168070,13 +164742,15 @@ impl<'a, C> RegionTargetHttpProxySetUrlMapCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -168352,25 +165026,15 @@ impl<'a, C> RegionTargetHttpsProxyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -168378,13 +165042,15 @@ impl<'a, C> RegionTargetHttpsProxyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -168646,25 +165312,15 @@ impl<'a, C> RegionTargetHttpsProxyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -168672,13 +165328,15 @@ impl<'a, C> RegionTargetHttpsProxyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -168953,25 +165611,15 @@ impl<'a, C> RegionTargetHttpsProxyInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -168979,13 +165627,15 @@ impl<'a, C> RegionTargetHttpsProxyInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -169269,25 +165919,15 @@ impl<'a, C> RegionTargetHttpsProxyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -169295,13 +165935,15 @@ impl<'a, C> RegionTargetHttpsProxyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -169613,25 +166255,15 @@ impl<'a, C> RegionTargetHttpsProxySetSslCertificateCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -169639,13 +166271,15 @@ impl<'a, C> RegionTargetHttpsProxySetSslCertificateCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -169942,25 +166576,15 @@ impl<'a, C> RegionTargetHttpsProxySetUrlMapCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -169968,13 +166592,15 @@ impl<'a, C> RegionTargetHttpsProxySetUrlMapCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -170250,25 +166876,15 @@ impl<'a, C> RegionUrlMapDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -170276,13 +166892,15 @@ impl<'a, C> RegionUrlMapDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -170540,25 +167158,15 @@ impl<'a, C> RegionUrlMapGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -170566,13 +167174,15 @@ impl<'a, C> RegionUrlMapGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -170847,25 +167457,15 @@ impl<'a, C> RegionUrlMapInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -170873,13 +167473,15 @@ impl<'a, C> RegionUrlMapInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -171159,25 +167761,15 @@ impl<'a, C> RegionUrlMapListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -171185,13 +167777,15 @@ impl<'a, C> RegionUrlMapListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -171503,25 +168097,15 @@ impl<'a, C> RegionUrlMapPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -171529,13 +168113,15 @@ impl<'a, C> RegionUrlMapPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -171828,25 +168414,15 @@ impl<'a, C> RegionUrlMapUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -171854,13 +168430,15 @@ impl<'a, C> RegionUrlMapUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -172148,25 +168726,15 @@ impl<'a, C> RegionUrlMapValidateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -172174,13 +168742,15 @@ impl<'a, C> RegionUrlMapValidateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -172438,25 +169008,15 @@ impl<'a, C> RegionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -172464,13 +169024,15 @@ impl<'a, C> RegionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -172732,25 +169294,15 @@ impl<'a, C> RegionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -172758,13 +169310,15 @@ impl<'a, C> RegionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -173066,25 +169620,15 @@ impl<'a, C> ReservationAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -173092,13 +169636,15 @@ impl<'a, C> ReservationAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -173386,25 +169932,15 @@ impl<'a, C> ReservationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -173412,13 +169948,15 @@ impl<'a, C> ReservationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -173680,25 +170218,15 @@ impl<'a, C> ReservationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -173706,13 +170234,15 @@ impl<'a, C> ReservationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -173968,25 +170498,15 @@ impl<'a, C> ReservationGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -173994,13 +170514,15 @@ impl<'a, C> ReservationGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -174282,25 +170804,15 @@ impl<'a, C> ReservationInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -174308,13 +170820,15 @@ impl<'a, C> ReservationInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -174598,25 +171112,15 @@ impl<'a, C> ReservationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -174624,13 +171128,15 @@ impl<'a, C> ReservationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -174942,25 +171448,15 @@ impl<'a, C> ReservationResizeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -174968,13 +171464,15 @@ impl<'a, C> ReservationResizeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -175266,25 +171764,15 @@ impl<'a, C> ReservationSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -175292,13 +171780,15 @@ impl<'a, C> ReservationSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -175579,25 +172069,15 @@ impl<'a, C> ReservationTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -175605,13 +172085,15 @@ impl<'a, C> ReservationTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -175897,25 +172379,15 @@ impl<'a, C> ResourcePolicyAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -175923,13 +172395,15 @@ impl<'a, C> ResourcePolicyAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -176217,25 +172691,15 @@ impl<'a, C> ResourcePolicyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -176243,13 +172707,15 @@ impl<'a, C> ResourcePolicyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -176511,25 +172977,15 @@ impl<'a, C> ResourcePolicyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -176537,13 +172993,15 @@ impl<'a, C> ResourcePolicyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -176799,25 +173257,15 @@ impl<'a, C> ResourcePolicyGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -176825,13 +173273,15 @@ impl<'a, C> ResourcePolicyGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -177113,25 +173563,15 @@ impl<'a, C> ResourcePolicyInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -177139,13 +173579,15 @@ impl<'a, C> ResourcePolicyInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -177429,25 +173871,15 @@ impl<'a, C> ResourcePolicyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -177455,13 +173887,15 @@ impl<'a, C> ResourcePolicyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -177768,25 +174202,15 @@ impl<'a, C> ResourcePolicySetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -177794,13 +174218,15 @@ impl<'a, C> ResourcePolicySetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -178081,25 +174507,15 @@ impl<'a, C> ResourcePolicyTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -178107,13 +174523,15 @@ impl<'a, C> ResourcePolicyTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -178399,25 +174817,15 @@ impl<'a, C> RouterAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -178425,13 +174833,15 @@ impl<'a, C> RouterAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -178719,25 +175129,15 @@ impl<'a, C> RouterDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -178745,13 +175145,15 @@ impl<'a, C> RouterDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -179013,25 +175415,15 @@ impl<'a, C> RouterGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -179039,13 +175431,15 @@ impl<'a, C> RouterGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -179321,25 +175715,15 @@ impl<'a, C> RouterGetNatMappingInfoCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -179347,13 +175731,15 @@ impl<'a, C> RouterGetNatMappingInfoCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -179649,25 +176035,15 @@ impl<'a, C> RouterGetRouterStatuCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -179675,13 +176051,15 @@ impl<'a, C> RouterGetRouterStatuCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -179956,25 +176334,15 @@ impl<'a, C> RouterInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -179982,13 +176350,15 @@ impl<'a, C> RouterInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -180272,25 +176642,15 @@ impl<'a, C> RouterListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -180298,13 +176658,15 @@ impl<'a, C> RouterListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -180616,25 +176978,15 @@ impl<'a, C> RouterPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -180642,13 +176994,15 @@ impl<'a, C> RouterPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -180940,25 +177294,15 @@ impl<'a, C> RouterPreviewCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -180966,13 +177310,15 @@ impl<'a, C> RouterPreviewCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -181258,25 +177604,15 @@ impl<'a, C> RouterUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -181284,13 +177620,15 @@ impl<'a, C> RouterUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -181564,25 +177902,15 @@ impl<'a, C> RouteDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -181590,13 +177918,15 @@ impl<'a, C> RouteDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -181846,25 +178176,15 @@ impl<'a, C> RouteGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -181872,13 +178192,15 @@ impl<'a, C> RouteGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -182141,25 +178463,15 @@ impl<'a, C> RouteInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -182167,13 +178479,15 @@ impl<'a, C> RouteInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -182445,25 +178759,15 @@ impl<'a, C> RouteListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -182471,13 +178775,15 @@ impl<'a, C> RouteListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -182772,25 +179078,15 @@ impl<'a, C> SecurityPolicyAddRuleCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -182798,13 +179094,15 @@ impl<'a, C> SecurityPolicyAddRuleCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -183057,25 +179355,15 @@ impl<'a, C> SecurityPolicyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -183083,13 +179371,15 @@ impl<'a, C> SecurityPolicyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -183339,25 +179629,15 @@ impl<'a, C> SecurityPolicyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -183365,13 +179645,15 @@ impl<'a, C> SecurityPolicyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -183615,25 +179897,15 @@ impl<'a, C> SecurityPolicyGetRuleCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -183641,13 +179913,15 @@ impl<'a, C> SecurityPolicyGetRuleCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -183917,25 +180191,15 @@ impl<'a, C> SecurityPolicyInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -183943,13 +180207,15 @@ impl<'a, C> SecurityPolicyInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -184221,25 +180487,15 @@ impl<'a, C> SecurityPolicyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -184247,13 +180503,15 @@ impl<'a, C> SecurityPolicyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -184550,25 +180808,15 @@ impl<'a, C> SecurityPolicyListPreconfiguredExpressionSetCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -184576,13 +180824,15 @@ impl<'a, C> SecurityPolicyListPreconfiguredExpressionSetCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -184882,25 +181132,15 @@ impl<'a, C> SecurityPolicyPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -184908,13 +181148,15 @@ impl<'a, C> SecurityPolicyPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -185199,25 +181441,15 @@ impl<'a, C> SecurityPolicyPatchRuleCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -185225,13 +181457,15 @@ impl<'a, C> SecurityPolicyPatchRuleCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -185491,25 +181725,15 @@ impl<'a, C> SecurityPolicyRemoveRuleCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -185517,13 +181741,15 @@ impl<'a, C> SecurityPolicyRemoveRuleCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -185776,25 +182002,15 @@ impl<'a, C> SnapshotDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -185802,13 +182018,15 @@ impl<'a, C> SnapshotDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -186058,25 +182276,15 @@ impl<'a, C> SnapshotGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -186084,13 +182292,15 @@ impl<'a, C> SnapshotGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -186334,25 +182544,15 @@ impl<'a, C> SnapshotGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -186360,13 +182560,15 @@ impl<'a, C> SnapshotGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -186635,25 +182837,15 @@ impl<'a, C> SnapshotListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -186661,13 +182853,15 @@ impl<'a, C> SnapshotListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -186962,25 +183156,15 @@ impl<'a, C> SnapshotSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -186988,13 +183172,15 @@ impl<'a, C> SnapshotSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -187263,25 +183449,15 @@ impl<'a, C> SnapshotSetLabelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -187289,13 +183465,15 @@ impl<'a, C> SnapshotSetLabelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -187564,25 +183742,15 @@ impl<'a, C> SnapshotTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -187590,13 +183758,15 @@ impl<'a, C> SnapshotTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -187872,25 +184042,15 @@ impl<'a, C> SslCertificateAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -187898,13 +184058,15 @@ impl<'a, C> SslCertificateAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -188190,25 +184352,15 @@ impl<'a, C> SslCertificateDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -188216,13 +184368,15 @@ impl<'a, C> SslCertificateDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -188472,25 +184626,15 @@ impl<'a, C> SslCertificateGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -188498,13 +184642,15 @@ impl<'a, C> SslCertificateGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -188767,25 +184913,15 @@ impl<'a, C> SslCertificateInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -188793,13 +184929,15 @@ impl<'a, C> SslCertificateInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -189071,25 +185209,15 @@ impl<'a, C> SslCertificateListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -189097,13 +185225,15 @@ impl<'a, C> SslCertificateListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -189382,25 +185512,15 @@ impl<'a, C> SslPolicyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -189408,13 +185528,15 @@ impl<'a, C> SslPolicyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -189664,25 +185786,15 @@ impl<'a, C> SslPolicyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -189690,13 +185802,15 @@ impl<'a, C> SslPolicyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -189959,25 +186073,15 @@ impl<'a, C> SslPolicyInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -189985,13 +186089,15 @@ impl<'a, C> SslPolicyInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -190263,25 +186369,15 @@ impl<'a, C> SslPolicyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -190289,13 +186385,15 @@ impl<'a, C> SslPolicyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -190592,25 +186690,15 @@ impl<'a, C> SslPolicyListAvailableFeatureCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -190618,13 +186706,15 @@ impl<'a, C> SslPolicyListAvailableFeatureCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -190924,25 +187014,15 @@ impl<'a, C> SslPolicyPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -190950,13 +187030,15 @@ impl<'a, C> SslPolicyPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -191243,25 +187325,15 @@ impl<'a, C> SubnetworkAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -191269,13 +187341,15 @@ impl<'a, C> SubnetworkAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -191563,25 +187637,15 @@ impl<'a, C> SubnetworkDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -191589,13 +187653,15 @@ impl<'a, C> SubnetworkDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -191883,25 +187949,15 @@ impl<'a, C> SubnetworkExpandIpCidrRangeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -191909,13 +187965,15 @@ impl<'a, C> SubnetworkExpandIpCidrRangeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -192186,25 +188244,15 @@ impl<'a, C> SubnetworkGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -192212,13 +188260,15 @@ impl<'a, C> SubnetworkGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -192474,25 +188524,15 @@ impl<'a, C> SubnetworkGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -192500,13 +188540,15 @@ impl<'a, C> SubnetworkGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -192788,25 +188830,15 @@ impl<'a, C> SubnetworkInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -192814,13 +188846,15 @@ impl<'a, C> SubnetworkInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -193104,25 +189138,15 @@ impl<'a, C> SubnetworkListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -193130,13 +189154,15 @@ impl<'a, C> SubnetworkListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -193443,25 +189469,15 @@ impl<'a, C> SubnetworkListUsableCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -193469,13 +189485,15 @@ impl<'a, C> SubnetworkListUsableCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -193782,25 +189800,15 @@ impl<'a, C> SubnetworkPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -193808,13 +189816,15 @@ impl<'a, C> SubnetworkPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -194113,25 +190123,15 @@ impl<'a, C> SubnetworkSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -194139,13 +190139,15 @@ impl<'a, C> SubnetworkSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -194431,25 +190433,15 @@ impl<'a, C> SubnetworkSetPrivateIpGoogleAccesCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -194457,13 +190449,15 @@ impl<'a, C> SubnetworkSetPrivateIpGoogleAccesCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -194755,25 +190749,15 @@ impl<'a, C> SubnetworkTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -194781,13 +190765,15 @@ impl<'a, C> SubnetworkTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -195050,25 +191036,15 @@ impl<'a, C> TargetGrpcProxyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -195076,13 +191052,15 @@ impl<'a, C> TargetGrpcProxyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -195332,25 +191310,15 @@ impl<'a, C> TargetGrpcProxyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -195358,13 +191326,15 @@ impl<'a, C> TargetGrpcProxyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -195627,25 +191597,15 @@ impl<'a, C> TargetGrpcProxyInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -195653,13 +191613,15 @@ impl<'a, C> TargetGrpcProxyInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -195931,25 +191893,15 @@ impl<'a, C> TargetGrpcProxyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -195957,13 +191909,15 @@ impl<'a, C> TargetGrpcProxyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -196263,25 +192217,15 @@ impl<'a, C> TargetGrpcProxyPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -196289,13 +192233,15 @@ impl<'a, C> TargetGrpcProxyPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -196582,25 +192528,15 @@ impl<'a, C> TargetHttpProxyAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -196608,13 +192544,15 @@ impl<'a, C> TargetHttpProxyAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -196900,25 +192838,15 @@ impl<'a, C> TargetHttpProxyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -196926,13 +192854,15 @@ impl<'a, C> TargetHttpProxyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -197182,25 +193112,15 @@ impl<'a, C> TargetHttpProxyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -197208,13 +193128,15 @@ impl<'a, C> TargetHttpProxyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -197477,25 +193399,15 @@ impl<'a, C> TargetHttpProxyInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -197503,13 +193415,15 @@ impl<'a, C> TargetHttpProxyInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -197781,25 +193695,15 @@ impl<'a, C> TargetHttpProxyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -197807,13 +193711,15 @@ impl<'a, C> TargetHttpProxyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -198113,25 +194019,15 @@ impl<'a, C> TargetHttpProxyPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -198139,13 +194035,15 @@ impl<'a, C> TargetHttpProxyPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -198430,25 +194328,15 @@ impl<'a, C> TargetHttpProxySetUrlMapCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -198456,13 +194344,15 @@ impl<'a, C> TargetHttpProxySetUrlMapCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -198749,25 +194639,15 @@ impl<'a, C> TargetHttpsProxyAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -198775,13 +194655,15 @@ impl<'a, C> TargetHttpsProxyAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -199067,25 +194949,15 @@ impl<'a, C> TargetHttpsProxyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -199093,13 +194965,15 @@ impl<'a, C> TargetHttpsProxyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -199349,25 +195223,15 @@ impl<'a, C> TargetHttpsProxyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -199375,13 +195239,15 @@ impl<'a, C> TargetHttpsProxyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -199644,25 +195510,15 @@ impl<'a, C> TargetHttpsProxyInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -199670,13 +195526,15 @@ impl<'a, C> TargetHttpsProxyInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -199948,25 +195806,15 @@ impl<'a, C> TargetHttpsProxyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -199974,13 +195822,15 @@ impl<'a, C> TargetHttpsProxyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -200280,25 +196130,15 @@ impl<'a, C> TargetHttpsProxyPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -200306,13 +196146,15 @@ impl<'a, C> TargetHttpsProxyPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -200597,25 +196439,15 @@ impl<'a, C> TargetHttpsProxySetQuicOverrideCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -200623,13 +196455,15 @@ impl<'a, C> TargetHttpsProxySetQuicOverrideCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -200914,25 +196748,15 @@ impl<'a, C> TargetHttpsProxySetSslCertificateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -200940,13 +196764,15 @@ impl<'a, C> TargetHttpsProxySetSslCertificateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -201231,25 +197057,15 @@ impl<'a, C> TargetHttpsProxySetSslPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -201257,13 +197073,15 @@ impl<'a, C> TargetHttpsProxySetSslPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -201548,25 +197366,15 @@ impl<'a, C> TargetHttpsProxySetUrlMapCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -201574,13 +197382,15 @@ impl<'a, C> TargetHttpsProxySetUrlMapCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -201867,25 +197677,15 @@ impl<'a, C> TargetInstanceAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -201893,13 +197693,15 @@ impl<'a, C> TargetInstanceAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -202187,25 +197989,15 @@ impl<'a, C> TargetInstanceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -202213,13 +198005,15 @@ impl<'a, C> TargetInstanceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -202481,25 +198275,15 @@ impl<'a, C> TargetInstanceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -202507,13 +198291,15 @@ impl<'a, C> TargetInstanceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -202788,25 +198574,15 @@ impl<'a, C> TargetInstanceInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -202814,13 +198590,15 @@ impl<'a, C> TargetInstanceInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -203104,25 +198882,15 @@ impl<'a, C> TargetInstanceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -203130,13 +198898,15 @@ impl<'a, C> TargetInstanceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -203448,25 +199218,15 @@ impl<'a, C> TargetPoolAddHealthCheckCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -203474,13 +199234,15 @@ impl<'a, C> TargetPoolAddHealthCheckCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -203777,25 +199539,15 @@ impl<'a, C> TargetPoolAddInstanceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -203803,13 +199555,15 @@ impl<'a, C> TargetPoolAddInstanceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -204106,25 +199860,15 @@ impl<'a, C> TargetPoolAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -204132,13 +199876,15 @@ impl<'a, C> TargetPoolAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -204426,25 +200172,15 @@ impl<'a, C> TargetPoolDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -204452,13 +200188,15 @@ impl<'a, C> TargetPoolDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -204720,25 +200458,15 @@ impl<'a, C> TargetPoolGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -204746,13 +200474,15 @@ impl<'a, C> TargetPoolGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -205024,25 +200754,15 @@ impl<'a, C> TargetPoolGetHealthCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -205050,13 +200770,15 @@ impl<'a, C> TargetPoolGetHealthCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -205340,25 +201062,15 @@ impl<'a, C> TargetPoolInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -205366,13 +201078,15 @@ impl<'a, C> TargetPoolInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -205656,25 +201370,15 @@ impl<'a, C> TargetPoolListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -205682,13 +201386,15 @@ impl<'a, C> TargetPoolListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -206000,25 +201706,15 @@ impl<'a, C> TargetPoolRemoveHealthCheckCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -206026,13 +201722,15 @@ impl<'a, C> TargetPoolRemoveHealthCheckCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -206329,25 +202027,15 @@ impl<'a, C> TargetPoolRemoveInstanceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -206355,13 +202043,15 @@ impl<'a, C> TargetPoolRemoveInstanceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -206663,25 +202353,15 @@ impl<'a, C> TargetPoolSetBackupCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -206689,13 +202369,15 @@ impl<'a, C> TargetPoolSetBackupCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -206976,25 +202658,15 @@ impl<'a, C> TargetSslProxyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -207002,13 +202674,15 @@ impl<'a, C> TargetSslProxyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -207258,25 +202932,15 @@ impl<'a, C> TargetSslProxyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -207284,13 +202948,15 @@ impl<'a, C> TargetSslProxyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -207553,25 +203219,15 @@ impl<'a, C> TargetSslProxyInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -207579,13 +203235,15 @@ impl<'a, C> TargetSslProxyInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -207857,25 +203515,15 @@ impl<'a, C> TargetSslProxyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -207883,13 +203531,15 @@ impl<'a, C> TargetSslProxyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -208189,25 +203839,15 @@ impl<'a, C> TargetSslProxySetBackendServiceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -208215,13 +203855,15 @@ impl<'a, C> TargetSslProxySetBackendServiceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -208506,25 +204148,15 @@ impl<'a, C> TargetSslProxySetProxyHeaderCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -208532,13 +204164,15 @@ impl<'a, C> TargetSslProxySetProxyHeaderCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -208823,25 +204457,15 @@ impl<'a, C> TargetSslProxySetSslCertificateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -208849,13 +204473,15 @@ impl<'a, C> TargetSslProxySetSslCertificateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -209140,25 +204766,15 @@ impl<'a, C> TargetSslProxySetSslPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -209166,13 +204782,15 @@ impl<'a, C> TargetSslProxySetSslPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -209436,25 +205054,15 @@ impl<'a, C> TargetTcpProxyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -209462,13 +205070,15 @@ impl<'a, C> TargetTcpProxyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -209718,25 +205328,15 @@ impl<'a, C> TargetTcpProxyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -209744,13 +205344,15 @@ impl<'a, C> TargetTcpProxyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -210013,25 +205615,15 @@ impl<'a, C> TargetTcpProxyInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -210039,13 +205631,15 @@ impl<'a, C> TargetTcpProxyInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -210317,25 +205911,15 @@ impl<'a, C> TargetTcpProxyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -210343,13 +205927,15 @@ impl<'a, C> TargetTcpProxyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -210649,25 +206235,15 @@ impl<'a, C> TargetTcpProxySetBackendServiceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -210675,13 +206251,15 @@ impl<'a, C> TargetTcpProxySetBackendServiceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -210966,25 +206544,15 @@ impl<'a, C> TargetTcpProxySetProxyHeaderCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -210992,13 +206560,15 @@ impl<'a, C> TargetTcpProxySetProxyHeaderCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -211285,25 +206855,15 @@ impl<'a, C> TargetVpnGatewayAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -211311,13 +206871,15 @@ impl<'a, C> TargetVpnGatewayAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -211605,25 +207167,15 @@ impl<'a, C> TargetVpnGatewayDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -211631,13 +207183,15 @@ impl<'a, C> TargetVpnGatewayDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -211899,25 +207453,15 @@ impl<'a, C> TargetVpnGatewayGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -211925,13 +207469,15 @@ impl<'a, C> TargetVpnGatewayGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -212206,25 +207752,15 @@ impl<'a, C> TargetVpnGatewayInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -212232,13 +207768,15 @@ impl<'a, C> TargetVpnGatewayInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -212522,25 +208060,15 @@ impl<'a, C> TargetVpnGatewayListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -212548,13 +208076,15 @@ impl<'a, C> TargetVpnGatewayListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -212866,25 +208396,15 @@ impl<'a, C> UrlMapAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -212892,13 +208412,15 @@ impl<'a, C> UrlMapAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -213184,25 +208706,15 @@ impl<'a, C> UrlMapDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -213210,13 +208722,15 @@ impl<'a, C> UrlMapDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -213466,25 +208980,15 @@ impl<'a, C> UrlMapGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -213492,13 +208996,15 @@ impl<'a, C> UrlMapGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -213761,25 +209267,15 @@ impl<'a, C> UrlMapInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -213787,13 +209283,15 @@ impl<'a, C> UrlMapInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -214070,25 +209568,15 @@ impl<'a, C> UrlMapInvalidateCacheCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -214096,13 +209584,15 @@ impl<'a, C> UrlMapInvalidateCacheCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -214384,25 +209874,15 @@ impl<'a, C> UrlMapListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -214410,13 +209890,15 @@ impl<'a, C> UrlMapListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -214716,25 +210198,15 @@ impl<'a, C> UrlMapPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -214742,13 +210214,15 @@ impl<'a, C> UrlMapPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -215033,25 +210507,15 @@ impl<'a, C> UrlMapUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -215059,13 +210523,15 @@ impl<'a, C> UrlMapUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -215345,25 +210811,15 @@ impl<'a, C> UrlMapValidateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -215371,13 +210827,15 @@ impl<'a, C> UrlMapValidateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -215653,25 +211111,15 @@ impl<'a, C> VpnGatewayAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -215679,13 +211127,15 @@ impl<'a, C> VpnGatewayAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -215973,25 +211423,15 @@ impl<'a, C> VpnGatewayDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -215999,13 +211439,15 @@ impl<'a, C> VpnGatewayDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -216267,25 +211709,15 @@ impl<'a, C> VpnGatewayGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -216293,13 +211725,15 @@ impl<'a, C> VpnGatewayGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -216550,25 +211984,15 @@ impl<'a, C> VpnGatewayGetStatuCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -216576,13 +212000,15 @@ impl<'a, C> VpnGatewayGetStatuCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -216857,25 +212283,15 @@ impl<'a, C> VpnGatewayInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -216883,13 +212299,15 @@ impl<'a, C> VpnGatewayInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -217173,25 +212591,15 @@ impl<'a, C> VpnGatewayListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -217199,13 +212607,15 @@ impl<'a, C> VpnGatewayListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -217517,25 +212927,15 @@ impl<'a, C> VpnGatewaySetLabelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -217543,13 +212943,15 @@ impl<'a, C> VpnGatewaySetLabelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -217841,25 +213243,15 @@ impl<'a, C> VpnGatewayTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -217867,13 +213259,15 @@ impl<'a, C> VpnGatewayTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -218159,25 +213553,15 @@ impl<'a, C> VpnTunnelAggregatedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -218185,13 +213569,15 @@ impl<'a, C> VpnTunnelAggregatedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -218479,25 +213865,15 @@ impl<'a, C> VpnTunnelDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -218505,13 +213881,15 @@ impl<'a, C> VpnTunnelDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -218773,25 +214151,15 @@ impl<'a, C> VpnTunnelGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -218799,13 +214167,15 @@ impl<'a, C> VpnTunnelGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -219080,25 +214450,15 @@ impl<'a, C> VpnTunnelInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -219106,13 +214466,15 @@ impl<'a, C> VpnTunnelInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -219396,25 +214758,15 @@ impl<'a, C> VpnTunnelListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -219422,13 +214774,15 @@ impl<'a, C> VpnTunnelListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -219713,25 +215067,15 @@ impl<'a, C> ZoneOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -219739,11 +215083,11 @@ impl<'a, C> ZoneOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -219988,25 +215332,15 @@ impl<'a, C> ZoneOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -220014,13 +215348,15 @@ impl<'a, C> ZoneOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -220294,25 +215630,15 @@ impl<'a, C> ZoneOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -220320,13 +215646,15 @@ impl<'a, C> ZoneOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -220616,25 +215944,15 @@ impl<'a, C> ZoneOperationWaitCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -220642,13 +215960,15 @@ impl<'a, C> ZoneOperationWaitCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -220897,25 +216217,15 @@ impl<'a, C> ZoneGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -220923,13 +216233,15 @@ impl<'a, C> ZoneGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -221191,25 +216503,15 @@ impl<'a, C> ZoneListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -221217,13 +216519,15 @@ impl<'a, C> ZoneListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/compute1/src/client.rs b/gen/compute1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/compute1/src/client.rs +++ b/gen/compute1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/consumersurveys2-cli/src/main.rs b/gen/consumersurveys2-cli/src/main.rs index a97a6c76b6..acd219136a 100644 --- a/gen/consumersurveys2-cli/src/main.rs +++ b/gen/consumersurveys2-cli/src/main.rs @@ -122,7 +122,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-index", "max-results", "token"].iter().map(|v|*v)); + v.extend(["max-results", "start-index", "token"].iter().map(|v|*v)); v } )); } } @@ -577,7 +577,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-index", "max-results", "token"].iter().map(|v|*v)); + v.extend(["max-results", "start-index", "token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/consumersurveys2/src/api.rs b/gen/consumersurveys2/src/api.rs index 4a72fdcc7e..949be6c3f9 100644 --- a/gen/consumersurveys2/src/api.rs +++ b/gen/consumersurveys2/src/api.rs @@ -1111,25 +1111,15 @@ impl<'a, C> MobileapppanelGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1137,13 +1127,15 @@ impl<'a, C> MobileapppanelGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1362,25 +1354,15 @@ impl<'a, C> MobileapppanelListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1388,13 +1370,15 @@ impl<'a, C> MobileapppanelListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1650,25 +1634,15 @@ impl<'a, C> MobileapppanelUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1676,13 +1650,15 @@ impl<'a, C> MobileapppanelUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1960,25 +1936,15 @@ impl<'a, C> ResultGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1986,19 +1952,21 @@ impl<'a, C> ResultGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = if enable_resource_parsing { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); } } - } else { (reconstructed_result, Default::default()) }; + } else { (res, Default::default()) }; dlg.finished(true); return Ok(result_value) @@ -2228,25 +2196,15 @@ impl<'a, C> SurveyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2254,13 +2212,15 @@ impl<'a, C> SurveyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2487,25 +2447,15 @@ impl<'a, C> SurveyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2513,13 +2463,15 @@ impl<'a, C> SurveyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2744,25 +2696,15 @@ impl<'a, C> SurveyInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2770,13 +2712,15 @@ impl<'a, C> SurveyInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2994,25 +2938,15 @@ impl<'a, C> SurveyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3020,13 +2954,15 @@ impl<'a, C> SurveyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3282,25 +3218,15 @@ impl<'a, C> SurveyStartCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3308,13 +3234,15 @@ impl<'a, C> SurveyStartCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3549,25 +3477,15 @@ impl<'a, C> SurveyStopCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3575,13 +3493,15 @@ impl<'a, C> SurveyStopCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3828,25 +3748,15 @@ impl<'a, C> SurveyUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3854,13 +3764,15 @@ impl<'a, C> SurveyUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/consumersurveys2/src/client.rs b/gen/consumersurveys2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/consumersurveys2/src/client.rs +++ b/gen/consumersurveys2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/container1-cli/src/main.rs b/gen/container1-cli/src/main.rs index d21279c445..df98703ead 100644 --- a/gen/container1-cli/src/main.rs +++ b/gen/container1-cli/src/main.rs @@ -70,7 +70,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "page-token", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -443,7 +443,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["cluster-id", "zone", "project-id"].iter().map(|v|*v)); + v.extend(["cluster-id", "project-id", "zone"].iter().map(|v|*v)); v } )); } } @@ -505,7 +505,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["cluster-id", "zone", "project-id"].iter().map(|v|*v)); + v.extend(["cluster-id", "project-id", "zone"].iter().map(|v|*v)); v } )); } } @@ -613,7 +613,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["zone", "project-id"].iter().map(|v|*v)); + v.extend(["project-id", "zone"].iter().map(|v|*v)); v } )); } } @@ -811,7 +811,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["cluster-id", "node-pool-id", "zone", "project-id"].iter().map(|v|*v)); + v.extend(["cluster-id", "node-pool-id", "project-id", "zone"].iter().map(|v|*v)); v } )); } } @@ -876,7 +876,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["cluster-id", "node-pool-id", "zone", "project-id"].iter().map(|v|*v)); + v.extend(["cluster-id", "node-pool-id", "project-id", "zone"].iter().map(|v|*v)); v } )); } } @@ -938,7 +938,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["cluster-id", "zone", "project-id"].iter().map(|v|*v)); + v.extend(["cluster-id", "project-id", "zone"].iter().map(|v|*v)); v } )); } } @@ -2657,7 +2657,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["zone", "project-id"].iter().map(|v|*v)); + v.extend(["project-id", "zone"].iter().map(|v|*v)); v } )); } } @@ -2807,7 +2807,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["zone", "operation-id", "project-id"].iter().map(|v|*v)); + v.extend(["operation-id", "project-id", "zone"].iter().map(|v|*v)); v } )); } } @@ -2866,7 +2866,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["zone", "project-id"].iter().map(|v|*v)); + v.extend(["project-id", "zone"].iter().map(|v|*v)); v } )); } } diff --git a/gen/container1/src/api.rs b/gen/container1/src/api.rs index ac672b3851..6be3419299 100644 --- a/gen/container1/src/api.rs +++ b/gen/container1/src/api.rs @@ -4135,25 +4135,15 @@ impl<'a, C> ProjectAggregatedUsableSubnetworkListCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4161,13 +4151,15 @@ impl<'a, C> ProjectAggregatedUsableSubnetworkListCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4444,25 +4436,15 @@ impl<'a, C> ProjectLocationClusterNodePoolCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4470,13 +4452,15 @@ impl<'a, C> ProjectLocationClusterNodePoolCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4740,25 +4724,15 @@ impl<'a, C> ProjectLocationClusterNodePoolDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4766,13 +4740,15 @@ impl<'a, C> ProjectLocationClusterNodePoolDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5055,25 +5031,15 @@ impl<'a, C> ProjectLocationClusterNodePoolGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5081,13 +5047,15 @@ impl<'a, C> ProjectLocationClusterNodePoolGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5365,25 +5333,15 @@ impl<'a, C> ProjectLocationClusterNodePoolListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5391,13 +5349,15 @@ impl<'a, C> ProjectLocationClusterNodePoolListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5674,25 +5634,15 @@ impl<'a, C> ProjectLocationClusterNodePoolRollbackCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5700,13 +5650,15 @@ impl<'a, C> ProjectLocationClusterNodePoolRollbackCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5971,25 +5923,15 @@ impl<'a, C> ProjectLocationClusterNodePoolSetAutoscalingCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5997,13 +5939,15 @@ impl<'a, C> ProjectLocationClusterNodePoolSetAutoscalingCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6268,25 +6212,15 @@ impl<'a, C> ProjectLocationClusterNodePoolSetManagementCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6294,13 +6228,15 @@ impl<'a, C> ProjectLocationClusterNodePoolSetManagementCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6565,25 +6501,15 @@ impl<'a, C> ProjectLocationClusterNodePoolSetSizeCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6591,13 +6517,15 @@ impl<'a, C> ProjectLocationClusterNodePoolSetSizeCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6862,25 +6790,15 @@ impl<'a, C> ProjectLocationClusterNodePoolUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6888,13 +6806,15 @@ impl<'a, C> ProjectLocationClusterNodePoolUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7130,25 +7050,15 @@ impl<'a, C> ProjectLocationClusterWellKnownGetOpenidConfigurationCall<'a, C> whe return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7156,13 +7066,15 @@ impl<'a, C> ProjectLocationClusterWellKnownGetOpenidConfigurationCall<'a, C> whe } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7395,25 +7307,15 @@ impl<'a, C> ProjectLocationClusterCompleteIpRotationCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7421,13 +7323,15 @@ impl<'a, C> ProjectLocationClusterCompleteIpRotationCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7692,25 +7596,15 @@ impl<'a, C> ProjectLocationClusterCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7718,13 +7612,15 @@ impl<'a, C> ProjectLocationClusterCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7983,25 +7879,15 @@ impl<'a, C> ProjectLocationClusterDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8009,13 +7895,15 @@ impl<'a, C> ProjectLocationClusterDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8286,25 +8174,15 @@ impl<'a, C> ProjectLocationClusterGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8312,13 +8190,15 @@ impl<'a, C> ProjectLocationClusterGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8566,25 +8446,15 @@ impl<'a, C> ProjectLocationClusterGetJwkCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8592,13 +8462,15 @@ impl<'a, C> ProjectLocationClusterGetJwkCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8820,25 +8692,15 @@ impl<'a, C> ProjectLocationClusterListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8846,13 +8708,15 @@ impl<'a, C> ProjectLocationClusterListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9122,25 +8986,15 @@ impl<'a, C> ProjectLocationClusterSetAddonCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9148,13 +9002,15 @@ impl<'a, C> ProjectLocationClusterSetAddonCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9419,25 +9275,15 @@ impl<'a, C> ProjectLocationClusterSetLegacyAbacCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9445,13 +9291,15 @@ impl<'a, C> ProjectLocationClusterSetLegacyAbacCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9716,25 +9564,15 @@ impl<'a, C> ProjectLocationClusterSetLocationCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9742,13 +9580,15 @@ impl<'a, C> ProjectLocationClusterSetLocationCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10013,25 +9853,15 @@ impl<'a, C> ProjectLocationClusterSetLoggingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10039,13 +9869,15 @@ impl<'a, C> ProjectLocationClusterSetLoggingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10310,25 +10142,15 @@ impl<'a, C> ProjectLocationClusterSetMaintenancePolicyCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10336,13 +10158,15 @@ impl<'a, C> ProjectLocationClusterSetMaintenancePolicyCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10607,25 +10431,15 @@ impl<'a, C> ProjectLocationClusterSetMasterAuthCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10633,13 +10447,15 @@ impl<'a, C> ProjectLocationClusterSetMasterAuthCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10904,25 +10720,15 @@ impl<'a, C> ProjectLocationClusterSetMonitoringCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10930,13 +10736,15 @@ impl<'a, C> ProjectLocationClusterSetMonitoringCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11201,25 +11009,15 @@ impl<'a, C> ProjectLocationClusterSetNetworkPolicyCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11227,13 +11025,15 @@ impl<'a, C> ProjectLocationClusterSetNetworkPolicyCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11498,25 +11298,15 @@ impl<'a, C> ProjectLocationClusterSetResourceLabelCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11524,13 +11314,15 @@ impl<'a, C> ProjectLocationClusterSetResourceLabelCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11795,25 +11587,15 @@ impl<'a, C> ProjectLocationClusterStartIpRotationCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11821,13 +11603,15 @@ impl<'a, C> ProjectLocationClusterStartIpRotationCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12092,25 +11876,15 @@ impl<'a, C> ProjectLocationClusterUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12118,13 +11892,15 @@ impl<'a, C> ProjectLocationClusterUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12389,25 +12165,15 @@ impl<'a, C> ProjectLocationClusterUpdateMasterCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12415,13 +12181,15 @@ impl<'a, C> ProjectLocationClusterUpdateMasterCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12686,25 +12454,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12712,13 +12470,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12977,25 +12737,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13003,13 +12753,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13275,25 +13027,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13301,13 +13043,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13566,25 +13310,15 @@ impl<'a, C> ProjectLocationGetServerConfigCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13592,13 +13326,15 @@ impl<'a, C> ProjectLocationGetServerConfigCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13870,25 +13606,15 @@ impl<'a, C> ProjectZoneClusterNodePoolAutoscalingCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13896,13 +13622,15 @@ impl<'a, C> ProjectZoneClusterNodePoolAutoscalingCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14197,25 +13925,15 @@ impl<'a, C> ProjectZoneClusterNodePoolCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14223,13 +13941,15 @@ impl<'a, C> ProjectZoneClusterNodePoolCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14500,25 +14220,15 @@ impl<'a, C> ProjectZoneClusterNodePoolDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14526,13 +14236,15 @@ impl<'a, C> ProjectZoneClusterNodePoolDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14811,25 +14523,15 @@ impl<'a, C> ProjectZoneClusterNodePoolGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14837,13 +14539,15 @@ impl<'a, C> ProjectZoneClusterNodePoolGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15120,25 +14824,15 @@ impl<'a, C> ProjectZoneClusterNodePoolListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15146,13 +14840,15 @@ impl<'a, C> ProjectZoneClusterNodePoolListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15437,25 +15133,15 @@ impl<'a, C> ProjectZoneClusterNodePoolRollbackCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15463,13 +15149,15 @@ impl<'a, C> ProjectZoneClusterNodePoolRollbackCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15766,25 +15454,15 @@ impl<'a, C> ProjectZoneClusterNodePoolSetManagementCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15792,13 +15470,15 @@ impl<'a, C> ProjectZoneClusterNodePoolSetManagementCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16095,25 +15775,15 @@ impl<'a, C> ProjectZoneClusterNodePoolSetSizeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16121,13 +15791,15 @@ impl<'a, C> ProjectZoneClusterNodePoolSetSizeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16424,25 +16096,15 @@ impl<'a, C> ProjectZoneClusterNodePoolUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16450,13 +16112,15 @@ impl<'a, C> ProjectZoneClusterNodePoolUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16751,25 +16415,15 @@ impl<'a, C> ProjectZoneClusterAddonCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16777,13 +16431,15 @@ impl<'a, C> ProjectZoneClusterAddonCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17068,25 +16724,15 @@ impl<'a, C> ProjectZoneClusterCompleteIpRotationCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17094,13 +16740,15 @@ impl<'a, C> ProjectZoneClusterCompleteIpRotationCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17383,25 +17031,15 @@ impl<'a, C> ProjectZoneClusterCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17409,13 +17047,15 @@ impl<'a, C> ProjectZoneClusterCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17674,25 +17314,15 @@ impl<'a, C> ProjectZoneClusterDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17700,13 +17330,15 @@ impl<'a, C> ProjectZoneClusterDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17973,25 +17605,15 @@ impl<'a, C> ProjectZoneClusterGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17999,13 +17621,15 @@ impl<'a, C> ProjectZoneClusterGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18288,25 +17912,15 @@ impl<'a, C> ProjectZoneClusterLegacyAbacCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18314,13 +17928,15 @@ impl<'a, C> ProjectZoneClusterLegacyAbacCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18587,25 +18203,15 @@ impl<'a, C> ProjectZoneClusterListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18613,13 +18219,15 @@ impl<'a, C> ProjectZoneClusterListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18892,25 +18500,15 @@ impl<'a, C> ProjectZoneClusterLocationCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18918,13 +18516,15 @@ impl<'a, C> ProjectZoneClusterLocationCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19209,25 +18809,15 @@ impl<'a, C> ProjectZoneClusterLoggingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19235,13 +18825,15 @@ impl<'a, C> ProjectZoneClusterLoggingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19526,25 +19118,15 @@ impl<'a, C> ProjectZoneClusterMasterCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19552,13 +19134,15 @@ impl<'a, C> ProjectZoneClusterMasterCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19843,25 +19427,15 @@ impl<'a, C> ProjectZoneClusterMonitoringCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19869,13 +19443,15 @@ impl<'a, C> ProjectZoneClusterMonitoringCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20160,25 +19736,15 @@ impl<'a, C> ProjectZoneClusterResourceLabelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20186,13 +19752,15 @@ impl<'a, C> ProjectZoneClusterResourceLabelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20477,25 +20045,15 @@ impl<'a, C> ProjectZoneClusterSetMaintenancePolicyCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20503,13 +20061,15 @@ impl<'a, C> ProjectZoneClusterSetMaintenancePolicyCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20794,25 +20354,15 @@ impl<'a, C> ProjectZoneClusterSetMasterAuthCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20820,13 +20370,15 @@ impl<'a, C> ProjectZoneClusterSetMasterAuthCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21111,25 +20663,15 @@ impl<'a, C> ProjectZoneClusterSetNetworkPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21137,13 +20679,15 @@ impl<'a, C> ProjectZoneClusterSetNetworkPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21428,25 +20972,15 @@ impl<'a, C> ProjectZoneClusterStartIpRotationCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21454,13 +20988,15 @@ impl<'a, C> ProjectZoneClusterStartIpRotationCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21745,25 +21281,15 @@ impl<'a, C> ProjectZoneClusterUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21771,13 +21297,15 @@ impl<'a, C> ProjectZoneClusterUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22062,25 +21590,15 @@ impl<'a, C> ProjectZoneOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22088,13 +21606,15 @@ impl<'a, C> ProjectZoneOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22363,25 +21883,15 @@ impl<'a, C> ProjectZoneOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22389,13 +21899,15 @@ impl<'a, C> ProjectZoneOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22660,25 +22172,15 @@ impl<'a, C> ProjectZoneOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22686,13 +22188,15 @@ impl<'a, C> ProjectZoneOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22947,25 +22451,15 @@ impl<'a, C> ProjectZoneGetServerconfigCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22973,13 +22467,15 @@ impl<'a, C> ProjectZoneGetServerconfigCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/container1/src/client.rs b/gen/container1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/container1/src/client.rs +++ b/gen/container1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/containeranalysis1_beta1-cli/src/main.rs b/gen/containeranalysis1_beta1-cli/src/main.rs index 3475dec21a..f9cd5884d2 100644 --- a/gen/containeranalysis1_beta1-cli/src/main.rs +++ b/gen/containeranalysis1_beta1-cli/src/main.rs @@ -469,7 +469,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -531,7 +531,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1423,7 +1423,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1864,7 +1864,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/containeranalysis1_beta1/src/api.rs b/gen/containeranalysis1_beta1/src/api.rs index 35cdd219df..50c39661ac 100644 --- a/gen/containeranalysis1_beta1/src/api.rs +++ b/gen/containeranalysis1_beta1/src/api.rs @@ -2511,25 +2511,15 @@ impl<'a, C> ProjectNoteOccurrenceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2537,13 +2527,15 @@ impl<'a, C> ProjectNoteOccurrenceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2820,25 +2812,15 @@ impl<'a, C> ProjectNoteBatchCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2846,13 +2828,15 @@ impl<'a, C> ProjectNoteBatchCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3122,25 +3106,15 @@ impl<'a, C> ProjectNoteCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3148,13 +3122,15 @@ impl<'a, C> ProjectNoteCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3405,25 +3381,15 @@ impl<'a, C> ProjectNoteDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3431,13 +3397,15 @@ impl<'a, C> ProjectNoteDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3672,25 +3640,15 @@ impl<'a, C> ProjectNoteGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3698,13 +3656,15 @@ impl<'a, C> ProjectNoteGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3960,25 +3920,15 @@ impl<'a, C> ProjectNoteGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3986,13 +3936,15 @@ impl<'a, C> ProjectNoteGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4251,25 +4203,15 @@ impl<'a, C> ProjectNoteListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4277,13 +4219,15 @@ impl<'a, C> ProjectNoteListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4565,25 +4509,15 @@ impl<'a, C> ProjectNotePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4591,13 +4525,15 @@ impl<'a, C> ProjectNotePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4869,25 +4805,15 @@ impl<'a, C> ProjectNoteSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4895,13 +4821,15 @@ impl<'a, C> ProjectNoteSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5166,25 +5094,15 @@ impl<'a, C> ProjectNoteTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5192,13 +5110,15 @@ impl<'a, C> ProjectNoteTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5463,25 +5383,15 @@ impl<'a, C> ProjectOccurrenceBatchCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5489,13 +5399,15 @@ impl<'a, C> ProjectOccurrenceBatchCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5760,25 +5672,15 @@ impl<'a, C> ProjectOccurrenceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5786,13 +5688,15 @@ impl<'a, C> ProjectOccurrenceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6036,25 +5940,15 @@ impl<'a, C> ProjectOccurrenceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6062,13 +5956,15 @@ impl<'a, C> ProjectOccurrenceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6303,25 +6199,15 @@ impl<'a, C> ProjectOccurrenceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6329,13 +6215,15 @@ impl<'a, C> ProjectOccurrenceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6591,25 +6479,15 @@ impl<'a, C> ProjectOccurrenceGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6617,13 +6495,15 @@ impl<'a, C> ProjectOccurrenceGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6867,25 +6747,15 @@ impl<'a, C> ProjectOccurrenceGetNoteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6893,13 +6763,15 @@ impl<'a, C> ProjectOccurrenceGetNoteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7139,25 +7011,15 @@ impl<'a, C> ProjectOccurrenceGetVulnerabilitySummaryCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7165,13 +7027,15 @@ impl<'a, C> ProjectOccurrenceGetVulnerabilitySummaryCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7428,25 +7292,15 @@ impl<'a, C> ProjectOccurrenceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7454,13 +7308,15 @@ impl<'a, C> ProjectOccurrenceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7742,25 +7598,15 @@ impl<'a, C> ProjectOccurrencePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7768,13 +7614,15 @@ impl<'a, C> ProjectOccurrencePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8046,25 +7894,15 @@ impl<'a, C> ProjectOccurrenceSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8072,13 +7910,15 @@ impl<'a, C> ProjectOccurrenceSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8343,25 +8183,15 @@ impl<'a, C> ProjectOccurrenceTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8369,13 +8199,15 @@ impl<'a, C> ProjectOccurrenceTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8619,25 +8451,15 @@ impl<'a, C> ProjectScanConfigGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8645,13 +8467,15 @@ impl<'a, C> ProjectScanConfigGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8901,25 +8725,15 @@ impl<'a, C> ProjectScanConfigListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8927,13 +8741,15 @@ impl<'a, C> ProjectScanConfigListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9210,25 +9026,15 @@ impl<'a, C> ProjectScanConfigUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9236,13 +9042,15 @@ impl<'a, C> ProjectScanConfigUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/containeranalysis1_beta1/src/client.rs b/gen/containeranalysis1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/containeranalysis1_beta1/src/client.rs +++ b/gen/containeranalysis1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/content2-cli/src/main.rs b/gen/content2-cli/src/main.rs index 45f2d1511f..1b07add1b1 100644 --- a/gen/content2-cli/src/main.rs +++ b/gen/content2-cli/src/main.rs @@ -263,7 +263,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["force", "dry-run"].iter().map(|v|*v)); + v.extend(["dry-run", "force"].iter().map(|v|*v)); v } )); } } @@ -1820,7 +1820,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["language", "country"].iter().map(|v|*v)); + v.extend(["country", "language"].iter().map(|v|*v)); v } )); } } @@ -2943,7 +2943,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "disbursement-end-date", "disbursement-start-date", "page-token"].iter().map(|v|*v)); + v.extend(["disbursement-end-date", "disbursement-start-date", "max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3008,7 +3008,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["transaction-end-date", "transaction-start-date", "max-results", "page-token"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "transaction-end-date", "transaction-start-date"].iter().map(|v|*v)); v } )); } } @@ -3128,7 +3128,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["created-start-date", "page-token", "max-results", "created-end-date", "order-by"].iter().map(|v|*v)); + v.extend(["created-end-date", "created-start-date", "max-results", "order-by", "page-token"].iter().map(|v|*v)); v } )); } } @@ -4135,7 +4135,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["placed-date-start", "placed-date-end", "acknowledged", "statuses", "page-token", "max-results", "order-by"].iter().map(|v|*v)); + v.extend(["acknowledged", "max-results", "order-by", "page-token", "placed-date-end", "placed-date-start", "statuses"].iter().map(|v|*v)); v } )); } } @@ -6039,7 +6039,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["include-attributes", "destinations"].iter().map(|v|*v)); + v.extend(["destinations", "include-attributes"].iter().map(|v|*v)); v } )); } } @@ -6107,7 +6107,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["destinations", "include-invalid-inserted-items", "include-attributes", "page-token", "max-results"].iter().map(|v|*v)); + v.extend(["destinations", "include-attributes", "include-invalid-inserted-items", "max-results", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/content2/src/api.rs b/gen/content2/src/api.rs index 829a11f8fd..1231f06984 100644 --- a/gen/content2/src/api.rs +++ b/gen/content2/src/api.rs @@ -9362,25 +9362,15 @@ impl<'a, C> AccountAuthinfoCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9388,13 +9378,15 @@ impl<'a, C> AccountAuthinfoCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9622,25 +9614,15 @@ impl<'a, C> AccountClaimwebsiteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9648,13 +9630,15 @@ impl<'a, C> AccountClaimwebsiteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9905,25 +9889,15 @@ impl<'a, C> AccountCustombatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9931,13 +9905,15 @@ impl<'a, C> AccountCustombatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10185,25 +10161,15 @@ impl<'a, C> AccountDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10211,11 +10177,11 @@ impl<'a, C> AccountDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -10466,25 +10432,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10492,13 +10448,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10765,25 +10723,15 @@ impl<'a, C> AccountInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10791,13 +10739,15 @@ impl<'a, C> AccountInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11067,25 +11017,15 @@ impl<'a, C> AccountLinkCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11093,13 +11033,15 @@ impl<'a, C> AccountLinkCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11359,25 +11301,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11385,13 +11317,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11664,25 +11598,15 @@ impl<'a, C> AccountUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11690,13 +11614,15 @@ impl<'a, C> AccountUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11951,25 +11877,15 @@ impl<'a, C> AccountstatuseCustombatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11977,13 +11893,15 @@ impl<'a, C> AccountstatuseCustombatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12222,25 +12140,15 @@ impl<'a, C> AccountstatuseGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12248,13 +12156,15 @@ impl<'a, C> AccountstatuseGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12520,25 +12430,15 @@ impl<'a, C> AccountstatuseListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12546,13 +12446,15 @@ impl<'a, C> AccountstatuseListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12808,25 +12710,15 @@ impl<'a, C> AccounttaxCustombatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12834,13 +12726,15 @@ impl<'a, C> AccounttaxCustombatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13079,25 +12973,15 @@ impl<'a, C> AccounttaxGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13105,13 +12989,15 @@ impl<'a, C> AccounttaxGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13362,25 +13248,15 @@ impl<'a, C> AccounttaxListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13388,13 +13264,15 @@ impl<'a, C> AccounttaxListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13667,25 +13545,15 @@ impl<'a, C> AccounttaxUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13693,13 +13561,15 @@ impl<'a, C> AccounttaxUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13959,25 +13829,15 @@ impl<'a, C> DatafeedCustombatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13985,13 +13845,15 @@ impl<'a, C> DatafeedCustombatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14234,25 +14096,15 @@ impl<'a, C> DatafeedDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14260,11 +14112,11 @@ impl<'a, C> DatafeedDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -14513,25 +14365,15 @@ impl<'a, C> DatafeedFetchnowCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14539,13 +14381,15 @@ impl<'a, C> DatafeedFetchnowCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14795,25 +14639,15 @@ impl<'a, C> DatafeedGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14821,13 +14655,15 @@ impl<'a, C> DatafeedGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15094,25 +14930,15 @@ impl<'a, C> DatafeedInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15120,13 +14946,15 @@ impl<'a, C> DatafeedInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15383,25 +15211,15 @@ impl<'a, C> DatafeedListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15409,13 +15227,15 @@ impl<'a, C> DatafeedListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15688,25 +15508,15 @@ impl<'a, C> DatafeedUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15714,13 +15524,15 @@ impl<'a, C> DatafeedUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15975,25 +15787,15 @@ impl<'a, C> DatafeedstatuseCustombatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16001,13 +15803,15 @@ impl<'a, C> DatafeedstatuseCustombatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16249,25 +16053,15 @@ impl<'a, C> DatafeedstatuseGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16275,13 +16069,15 @@ impl<'a, C> DatafeedstatuseGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16546,25 +16342,15 @@ impl<'a, C> DatafeedstatuseListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16572,13 +16358,15 @@ impl<'a, C> DatafeedstatuseListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16826,25 +16614,15 @@ impl<'a, C> InventoryCustombatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16852,13 +16630,15 @@ impl<'a, C> InventoryCustombatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17125,25 +16905,15 @@ impl<'a, C> InventorySetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17151,13 +16921,15 @@ impl<'a, C> InventorySetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17427,25 +17199,15 @@ impl<'a, C> LiasettingCustombatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17453,13 +17215,15 @@ impl<'a, C> LiasettingCustombatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17698,25 +17462,15 @@ impl<'a, C> LiasettingGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17724,13 +17478,15 @@ impl<'a, C> LiasettingGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17973,25 +17729,15 @@ impl<'a, C> LiasettingGetaccessiblegmbaccountCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17999,13 +17745,15 @@ impl<'a, C> LiasettingGetaccessiblegmbaccountCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18256,25 +18004,15 @@ impl<'a, C> LiasettingListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18282,13 +18020,15 @@ impl<'a, C> LiasettingListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18510,25 +18250,15 @@ impl<'a, C> LiasettingListposdataproviderCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18536,13 +18266,15 @@ impl<'a, C> LiasettingListposdataproviderCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18767,25 +18499,15 @@ impl<'a, C> LiasettingRequestgmbaccesCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18793,13 +18515,15 @@ impl<'a, C> LiasettingRequestgmbaccesCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19054,25 +18778,15 @@ impl<'a, C> LiasettingRequestinventoryverificationCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19080,13 +18794,15 @@ impl<'a, C> LiasettingRequestinventoryverificationCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19347,25 +19063,15 @@ impl<'a, C> LiasettingSetinventoryverificationcontactCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19373,13 +19079,15 @@ impl<'a, C> LiasettingSetinventoryverificationcontactCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19674,25 +19382,15 @@ impl<'a, C> LiasettingSetposdataproviderCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19700,13 +19398,15 @@ impl<'a, C> LiasettingSetposdataproviderCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19999,25 +19699,15 @@ impl<'a, C> LiasettingUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20025,13 +19715,15 @@ impl<'a, C> LiasettingUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20311,25 +20003,15 @@ impl<'a, C> OrderinvoiceCreatechargeinvoiceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20337,13 +20019,15 @@ impl<'a, C> OrderinvoiceCreatechargeinvoiceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20616,25 +20300,15 @@ impl<'a, C> OrderinvoiceCreaterefundinvoiceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20642,13 +20316,15 @@ impl<'a, C> OrderinvoiceCreaterefundinvoiceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20918,25 +20594,15 @@ impl<'a, C> OrderreportListdisbursementCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20944,13 +20610,15 @@ impl<'a, C> OrderreportListdisbursementCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21231,25 +20899,15 @@ impl<'a, C> OrderreportListtransactionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21257,13 +20915,15 @@ impl<'a, C> OrderreportListtransactionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21534,25 +21194,15 @@ impl<'a, C> OrderreturnGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21560,13 +21210,15 @@ impl<'a, C> OrderreturnGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21832,25 +21484,15 @@ impl<'a, C> OrderreturnListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21858,13 +21500,15 @@ impl<'a, C> OrderreturnListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22153,25 +21797,15 @@ impl<'a, C> OrderAcknowledgeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22179,13 +21813,15 @@ impl<'a, C> OrderAcknowledgeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22437,25 +22073,15 @@ impl<'a, C> OrderAdvancetestorderCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22463,13 +22089,15 @@ impl<'a, C> OrderAdvancetestorderCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22733,25 +22361,15 @@ impl<'a, C> OrderCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22759,13 +22377,15 @@ impl<'a, C> OrderCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23038,25 +22658,15 @@ impl<'a, C> OrderCancellineitemCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23064,13 +22674,15 @@ impl<'a, C> OrderCancellineitemCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23343,25 +22955,15 @@ impl<'a, C> OrderCanceltestorderbycustomerCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23369,13 +22971,15 @@ impl<'a, C> OrderCanceltestorderbycustomerCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23646,25 +23250,15 @@ impl<'a, C> OrderCreatetestorderCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23672,13 +23266,15 @@ impl<'a, C> OrderCreatetestorderCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23941,25 +23537,15 @@ impl<'a, C> OrderCreatetestreturnCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23967,13 +23553,15 @@ impl<'a, C> OrderCreatetestreturnCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24221,25 +23809,15 @@ impl<'a, C> OrderCustombatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24247,13 +23825,15 @@ impl<'a, C> OrderCustombatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24485,25 +24065,15 @@ impl<'a, C> OrderGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24511,13 +24081,15 @@ impl<'a, C> OrderGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24760,25 +24332,15 @@ impl<'a, C> OrderGetbymerchantorderidCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24786,13 +24348,15 @@ impl<'a, C> OrderGetbymerchantorderidCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25040,25 +24604,15 @@ impl<'a, C> OrderGettestordertemplateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25066,13 +24620,15 @@ impl<'a, C> OrderGettestordertemplateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25343,25 +24899,15 @@ impl<'a, C> OrderInstorerefundlineitemCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25369,13 +24915,15 @@ impl<'a, C> OrderInstorerefundlineitemCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25662,25 +25210,15 @@ impl<'a, C> OrderListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25688,13 +25226,15 @@ impl<'a, C> OrderListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25998,25 +25538,15 @@ impl<'a, C> OrderRefundCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26024,13 +25554,15 @@ impl<'a, C> OrderRefundCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26303,25 +25835,15 @@ impl<'a, C> OrderRejectreturnlineitemCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26329,13 +25851,15 @@ impl<'a, C> OrderRejectreturnlineitemCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26608,25 +26132,15 @@ impl<'a, C> OrderReturnlineitemCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26634,13 +26148,15 @@ impl<'a, C> OrderReturnlineitemCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26913,25 +26429,15 @@ impl<'a, C> OrderReturnrefundlineitemCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26939,13 +26445,15 @@ impl<'a, C> OrderReturnrefundlineitemCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27218,25 +26726,15 @@ impl<'a, C> OrderSetlineitemmetadataCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27244,13 +26742,15 @@ impl<'a, C> OrderSetlineitemmetadataCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27523,25 +27023,15 @@ impl<'a, C> OrderShiplineitemCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27549,13 +27039,15 @@ impl<'a, C> OrderShiplineitemCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27828,25 +27320,15 @@ impl<'a, C> OrderUpdatelineitemshippingdetailCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27854,13 +27336,15 @@ impl<'a, C> OrderUpdatelineitemshippingdetailCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28133,25 +27617,15 @@ impl<'a, C> OrderUpdatemerchantorderidCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28159,13 +27633,15 @@ impl<'a, C> OrderUpdatemerchantorderidCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28438,25 +27914,15 @@ impl<'a, C> OrderUpdateshipmentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28464,13 +27930,15 @@ impl<'a, C> OrderUpdateshipmentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28723,25 +28191,15 @@ impl<'a, C> PoCustombatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28749,13 +28207,15 @@ impl<'a, C> PoCustombatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29000,25 +28460,15 @@ impl<'a, C> PoDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29026,11 +28476,11 @@ impl<'a, C> PoDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -29286,25 +28736,15 @@ impl<'a, C> PoGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29312,13 +28752,15 @@ impl<'a, C> PoGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29597,25 +29039,15 @@ impl<'a, C> PoInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29623,13 +29055,15 @@ impl<'a, C> PoInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29914,25 +29348,15 @@ impl<'a, C> PoInventoryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29940,13 +29364,15 @@ impl<'a, C> PoInventoryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30205,25 +29631,15 @@ impl<'a, C> PoListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30231,13 +29647,15 @@ impl<'a, C> PoListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30506,25 +29924,15 @@ impl<'a, C> PoSaleCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30532,13 +29940,15 @@ impl<'a, C> PoSaleCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30798,25 +30208,15 @@ impl<'a, C> ProductCustombatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30824,13 +30224,15 @@ impl<'a, C> ProductCustombatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31073,25 +30475,15 @@ impl<'a, C> ProductDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31099,11 +30491,11 @@ impl<'a, C> ProductDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -31347,25 +30739,15 @@ impl<'a, C> ProductGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31373,13 +30755,15 @@ impl<'a, C> ProductGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31646,25 +31030,15 @@ impl<'a, C> ProductInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31672,13 +31046,15 @@ impl<'a, C> ProductInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31940,25 +31316,15 @@ impl<'a, C> ProductListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31966,13 +31332,15 @@ impl<'a, C> ProductListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32227,25 +31595,15 @@ impl<'a, C> ProductstatuseCustombatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32253,13 +31611,15 @@ impl<'a, C> ProductstatuseCustombatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32510,25 +31870,15 @@ impl<'a, C> ProductstatuseGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32536,13 +31886,15 @@ impl<'a, C> ProductstatuseGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32825,25 +32177,15 @@ impl<'a, C> ProductstatuseListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32851,13 +32193,15 @@ impl<'a, C> ProductstatuseListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33127,25 +32471,15 @@ impl<'a, C> ShippingsettingCustombatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33153,13 +32487,15 @@ impl<'a, C> ShippingsettingCustombatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33398,25 +32734,15 @@ impl<'a, C> ShippingsettingGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33424,13 +32750,15 @@ impl<'a, C> ShippingsettingGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33671,25 +32999,15 @@ impl<'a, C> ShippingsettingGetsupportedcarrierCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33697,13 +33015,15 @@ impl<'a, C> ShippingsettingGetsupportedcarrierCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33934,25 +33254,15 @@ impl<'a, C> ShippingsettingGetsupportedholidayCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33960,13 +33270,15 @@ impl<'a, C> ShippingsettingGetsupportedholidayCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34197,25 +33509,15 @@ impl<'a, C> ShippingsettingGetsupportedpickupserviceCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34223,13 +33525,15 @@ impl<'a, C> ShippingsettingGetsupportedpickupserviceCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34470,25 +33774,15 @@ impl<'a, C> ShippingsettingListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34496,13 +33790,15 @@ impl<'a, C> ShippingsettingListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34775,25 +34071,15 @@ impl<'a, C> ShippingsettingUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34801,13 +34087,15 @@ impl<'a, C> ShippingsettingUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/content2/src/client.rs b/gen/content2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/content2/src/client.rs +++ b/gen/content2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/content2_sandbox-cli/src/main.rs b/gen/content2_sandbox-cli/src/main.rs index d3f90bdd27..9389f78286 100644 --- a/gen/content2_sandbox-cli/src/main.rs +++ b/gen/content2_sandbox-cli/src/main.rs @@ -668,7 +668,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "order-by", "page-token", "created-end-date", "created-start-date"].iter().map(|v|*v)); + v.extend(["created-end-date", "created-start-date", "max-results", "order-by", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1674,7 +1674,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["order-by", "max-results", "statuses", "placed-date-end", "page-token", "placed-date-start", "acknowledged"].iter().map(|v|*v)); + v.extend(["acknowledged", "max-results", "order-by", "page-token", "placed-date-end", "placed-date-start", "statuses"].iter().map(|v|*v)); v } )); } } diff --git a/gen/content2_sandbox/src/api.rs b/gen/content2_sandbox/src/api.rs index f6399fc207..26f9296ebb 100644 --- a/gen/content2_sandbox/src/api.rs +++ b/gen/content2_sandbox/src/api.rs @@ -3923,25 +3923,15 @@ impl<'a, C> OrderinvoiceCreatechargeinvoiceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3949,13 +3939,15 @@ impl<'a, C> OrderinvoiceCreatechargeinvoiceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4224,25 +4216,15 @@ impl<'a, C> OrderinvoiceCreaterefundinvoiceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4250,13 +4232,15 @@ impl<'a, C> OrderinvoiceCreaterefundinvoiceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4525,25 +4509,15 @@ impl<'a, C> OrderpaymentNotifyauthapprovedCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4551,13 +4525,15 @@ impl<'a, C> OrderpaymentNotifyauthapprovedCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4826,25 +4802,15 @@ impl<'a, C> OrderpaymentNotifyauthdeclinedCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4852,13 +4818,15 @@ impl<'a, C> OrderpaymentNotifyauthdeclinedCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5127,25 +5095,15 @@ impl<'a, C> OrderpaymentNotifychargeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5153,13 +5111,15 @@ impl<'a, C> OrderpaymentNotifychargeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5428,25 +5388,15 @@ impl<'a, C> OrderpaymentNotifyrefundCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5454,13 +5404,15 @@ impl<'a, C> OrderpaymentNotifyrefundCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5708,25 +5660,15 @@ impl<'a, C> OrderreturnGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5734,13 +5676,15 @@ impl<'a, C> OrderreturnGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6002,25 +5946,15 @@ impl<'a, C> OrderreturnListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6028,13 +5962,15 @@ impl<'a, C> OrderreturnListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6319,25 +6255,15 @@ impl<'a, C> OrderAcknowledgeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6345,13 +6271,15 @@ impl<'a, C> OrderAcknowledgeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6599,25 +6527,15 @@ impl<'a, C> OrderAdvancetestorderCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6625,13 +6543,15 @@ impl<'a, C> OrderAdvancetestorderCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6891,25 +6811,15 @@ impl<'a, C> OrderCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6917,13 +6827,15 @@ impl<'a, C> OrderCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7192,25 +7104,15 @@ impl<'a, C> OrderCancellineitemCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7218,13 +7120,15 @@ impl<'a, C> OrderCancellineitemCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7493,25 +7397,15 @@ impl<'a, C> OrderCanceltestorderbycustomerCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7519,13 +7413,15 @@ impl<'a, C> OrderCanceltestorderbycustomerCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7792,25 +7688,15 @@ impl<'a, C> OrderCreatetestorderCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7818,13 +7704,15 @@ impl<'a, C> OrderCreatetestorderCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8083,25 +7971,15 @@ impl<'a, C> OrderCreatetestreturnCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8109,13 +7987,15 @@ impl<'a, C> OrderCreatetestreturnCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8359,25 +8239,15 @@ impl<'a, C> OrderCustombatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8385,13 +8255,15 @@ impl<'a, C> OrderCustombatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8619,25 +8491,15 @@ impl<'a, C> OrderGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8645,13 +8507,15 @@ impl<'a, C> OrderGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8890,25 +8754,15 @@ impl<'a, C> OrderGetbymerchantorderidCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8916,13 +8770,15 @@ impl<'a, C> OrderGetbymerchantorderidCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9166,25 +9022,15 @@ impl<'a, C> OrderGettestordertemplateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9192,13 +9038,15 @@ impl<'a, C> OrderGettestordertemplateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9465,25 +9313,15 @@ impl<'a, C> OrderInstorerefundlineitemCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9491,13 +9329,15 @@ impl<'a, C> OrderInstorerefundlineitemCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9780,25 +9620,15 @@ impl<'a, C> OrderListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9806,13 +9636,15 @@ impl<'a, C> OrderListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10114,25 +9946,15 @@ impl<'a, C> OrderRefundCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10140,13 +9962,15 @@ impl<'a, C> OrderRefundCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10415,25 +10239,15 @@ impl<'a, C> OrderRejectreturnlineitemCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10441,13 +10255,15 @@ impl<'a, C> OrderRejectreturnlineitemCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10716,25 +10532,15 @@ impl<'a, C> OrderReturnlineitemCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10742,13 +10548,15 @@ impl<'a, C> OrderReturnlineitemCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11017,25 +10825,15 @@ impl<'a, C> OrderReturnrefundlineitemCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11043,13 +10841,15 @@ impl<'a, C> OrderReturnrefundlineitemCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11318,25 +11118,15 @@ impl<'a, C> OrderSetlineitemmetadataCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11344,13 +11134,15 @@ impl<'a, C> OrderSetlineitemmetadataCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11619,25 +11411,15 @@ impl<'a, C> OrderShiplineitemCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11645,13 +11427,15 @@ impl<'a, C> OrderShiplineitemCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11920,25 +11704,15 @@ impl<'a, C> OrderUpdatelineitemshippingdetailCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11946,13 +11720,15 @@ impl<'a, C> OrderUpdatelineitemshippingdetailCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12221,25 +11997,15 @@ impl<'a, C> OrderUpdatemerchantorderidCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12247,13 +12013,15 @@ impl<'a, C> OrderUpdatemerchantorderidCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12522,25 +12290,15 @@ impl<'a, C> OrderUpdateshipmentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12548,13 +12306,15 @@ impl<'a, C> OrderUpdateshipmentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/content2_sandbox/src/client.rs b/gen/content2_sandbox/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/content2_sandbox/src/client.rs +++ b/gen/content2_sandbox/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/coordinate1-cli/src/main.rs b/gen/coordinate1-cli/src/main.rs index 06b77b7d51..c1796f7f20 100644 --- a/gen/coordinate1-cli/src/main.rs +++ b/gen/coordinate1-cli/src/main.rs @@ -228,7 +228,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["assignee", "customer-name", "custom-field", "customer-phone-number", "note"].iter().map(|v|*v)); + v.extend(["assignee", "custom-field", "customer-name", "customer-phone-number", "note"].iter().map(|v|*v)); v } )); } } @@ -293,7 +293,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["omit-job-changes", "min-modified-timestamp-ms", "max-results", "page-token"].iter().map(|v|*v)); + v.extend(["max-results", "min-modified-timestamp-ms", "omit-job-changes", "page-token"].iter().map(|v|*v)); v } )); } } @@ -422,7 +422,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["lng", "assignee", "title", "customer-name", "custom-field", "customer-phone-number", "lat", "address", "progress", "note"].iter().map(|v|*v)); + v.extend(["address", "assignee", "custom-field", "customer-name", "customer-phone-number", "lat", "lng", "note", "progress", "title"].iter().map(|v|*v)); v } )); } } @@ -551,7 +551,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["lng", "assignee", "title", "customer-name", "custom-field", "customer-phone-number", "lat", "address", "progress", "note"].iter().map(|v|*v)); + v.extend(["address", "assignee", "custom-field", "customer-name", "customer-phone-number", "lat", "lng", "note", "progress", "title"].iter().map(|v|*v)); v } )); } } @@ -764,7 +764,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["end-time", "all-day", "start-time", "duration"].iter().map(|v|*v)); + v.extend(["all-day", "duration", "end-time", "start-time"].iter().map(|v|*v)); v } )); } } @@ -866,7 +866,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["end-time", "all-day", "start-time", "duration"].iter().map(|v|*v)); + v.extend(["all-day", "duration", "end-time", "start-time"].iter().map(|v|*v)); v } )); } } @@ -928,7 +928,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["admin", "worker", "dispatcher"].iter().map(|v|*v)); + v.extend(["admin", "dispatcher", "worker"].iter().map(|v|*v)); v } )); } } diff --git a/gen/coordinate1/src/api.rs b/gen/coordinate1/src/api.rs index 4b752c3fe0..f1168fb41a 100644 --- a/gen/coordinate1/src/api.rs +++ b/gen/coordinate1/src/api.rs @@ -1269,25 +1269,15 @@ impl<'a, C> CustomFieldDefListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1295,13 +1285,15 @@ impl<'a, C> CustomFieldDefListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1530,25 +1522,15 @@ impl<'a, C> JobGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1556,13 +1538,15 @@ impl<'a, C> JobGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1855,25 +1839,15 @@ impl<'a, C> JobInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1881,13 +1855,15 @@ impl<'a, C> JobInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2219,25 +2195,15 @@ impl<'a, C> JobListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2245,13 +2211,15 @@ impl<'a, C> JobListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2581,25 +2549,15 @@ impl<'a, C> JobPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2607,13 +2565,15 @@ impl<'a, C> JobPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3005,25 +2965,15 @@ impl<'a, C> JobUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3031,13 +2981,15 @@ impl<'a, C> JobUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3368,25 +3320,15 @@ impl<'a, C> LocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3394,13 +3336,15 @@ impl<'a, C> LocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3663,25 +3607,15 @@ impl<'a, C> ScheduleGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3689,13 +3623,15 @@ impl<'a, C> ScheduleGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3975,25 +3911,15 @@ impl<'a, C> SchedulePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4001,13 +3927,15 @@ impl<'a, C> SchedulePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4324,25 +4252,15 @@ impl<'a, C> ScheduleUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4350,13 +4268,15 @@ impl<'a, C> ScheduleUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4622,25 +4542,15 @@ impl<'a, C> TeamListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4648,13 +4558,15 @@ impl<'a, C> TeamListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4892,25 +4804,15 @@ impl<'a, C> WorkerListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4918,13 +4820,15 @@ impl<'a, C> WorkerListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/coordinate1/src/client.rs b/gen/coordinate1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/coordinate1/src/client.rs +++ b/gen/coordinate1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/customsearch1-cli/src/main.rs b/gen/customsearch1-cli/src/main.rs index ccb3ca2b78..2a07ad0690 100644 --- a/gen/customsearch1-cli/src/main.rs +++ b/gen/customsearch1-cli/src/main.rs @@ -154,7 +154,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["file-type", "filter", "cx", "googlehost", "img-size", "sort", "search-type", "related-site", "rights", "img-type", "cr", "site-search", "or-terms", "exact-terms", "gl", "safe", "q", "c2coff", "num", "link-site", "low-range", "lr", "start", "date-restrict", "img-dominant-color", "hl", "high-range", "site-search-filter", "hq", "exclude-terms", "img-color-type"].iter().map(|v|*v)); + v.extend(["c2coff", "cr", "cx", "date-restrict", "exact-terms", "exclude-terms", "file-type", "filter", "gl", "googlehost", "high-range", "hl", "hq", "img-color-type", "img-dominant-color", "img-size", "img-type", "link-site", "low-range", "lr", "num", "or-terms", "q", "related-site", "rights", "safe", "search-type", "site-search", "site-search-filter", "sort", "start"].iter().map(|v|*v)); v } )); } } @@ -297,7 +297,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["file-type", "filter", "cx", "googlehost", "img-size", "sort", "search-type", "related-site", "rights", "img-type", "cr", "site-search", "or-terms", "exact-terms", "gl", "safe", "q", "c2coff", "num", "link-site", "low-range", "lr", "start", "date-restrict", "img-dominant-color", "hl", "high-range", "site-search-filter", "hq", "exclude-terms", "img-color-type"].iter().map(|v|*v)); + v.extend(["c2coff", "cr", "cx", "date-restrict", "exact-terms", "exclude-terms", "file-type", "filter", "gl", "googlehost", "high-range", "hl", "hq", "img-color-type", "img-dominant-color", "img-size", "img-type", "link-site", "low-range", "lr", "num", "or-terms", "q", "related-site", "rights", "safe", "search-type", "site-search", "site-search-filter", "sort", "start"].iter().map(|v|*v)); v } )); } } diff --git a/gen/customsearch1/src/api.rs b/gen/customsearch1/src/api.rs index 886b259638..39b8ae7aa7 100644 --- a/gen/customsearch1/src/api.rs +++ b/gen/customsearch1/src/api.rs @@ -1168,25 +1168,15 @@ impl<'a, C> CseSiterestrictListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1194,13 +1184,15 @@ impl<'a, C> CseSiterestrictListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1739,25 +1731,15 @@ impl<'a, C> CseListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1765,13 +1747,15 @@ impl<'a, C> CseListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/customsearch1/src/client.rs b/gen/customsearch1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/customsearch1/src/client.rs +++ b/gen/customsearch1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/datacatalog1_beta1-cli/src/main.rs b/gen/datacatalog1_beta1-cli/src/main.rs index 633992e74b..906c762373 100644 --- a/gen/datacatalog1_beta1-cli/src/main.rs +++ b/gen/datacatalog1_beta1-cli/src/main.rs @@ -159,7 +159,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sql-resource", "linked-resource"].iter().map(|v|*v)); + v.extend(["linked-resource", "sql-resource"].iter().map(|v|*v)); v } )); } } @@ -666,7 +666,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["read-mask", "page-size", "page-token"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "read-mask"].iter().map(|v|*v)); v } )); } } @@ -3065,7 +3065,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["taxonomies", "serialized-taxonomies"].iter().map(|v|*v)); + v.extend(["serialized-taxonomies", "taxonomies"].iter().map(|v|*v)); v } )); } } diff --git a/gen/datacatalog1_beta1/src/api.rs b/gen/datacatalog1_beta1/src/api.rs index 0561226eac..06e6f9cf3b 100644 --- a/gen/datacatalog1_beta1/src/api.rs +++ b/gen/datacatalog1_beta1/src/api.rs @@ -2517,25 +2517,15 @@ impl<'a, C> CatalogSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2543,13 +2533,15 @@ impl<'a, C> CatalogSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2766,25 +2758,15 @@ impl<'a, C> EntryLookupCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2792,13 +2774,15 @@ impl<'a, C> EntryLookupCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3058,25 +3042,15 @@ impl<'a, C> ProjectLocationEntryGroupEntryTagCreateCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3084,13 +3058,15 @@ impl<'a, C> ProjectLocationEntryGroupEntryTagCreateCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3334,25 +3310,15 @@ impl<'a, C> ProjectLocationEntryGroupEntryTagDeleteCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3360,13 +3326,15 @@ impl<'a, C> ProjectLocationEntryGroupEntryTagDeleteCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3611,25 +3579,15 @@ impl<'a, C> ProjectLocationEntryGroupEntryTagListCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3637,13 +3595,15 @@ impl<'a, C> ProjectLocationEntryGroupEntryTagListCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3918,25 +3878,15 @@ impl<'a, C> ProjectLocationEntryGroupEntryTagPatchCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3944,13 +3894,15 @@ impl<'a, C> ProjectLocationEntryGroupEntryTagPatchCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4227,25 +4179,15 @@ impl<'a, C> ProjectLocationEntryGroupEntryCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4253,13 +4195,15 @@ impl<'a, C> ProjectLocationEntryGroupEntryCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4510,25 +4454,15 @@ impl<'a, C> ProjectLocationEntryGroupEntryDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4536,13 +4470,15 @@ impl<'a, C> ProjectLocationEntryGroupEntryDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4777,25 +4713,15 @@ impl<'a, C> ProjectLocationEntryGroupEntryGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4803,13 +4729,15 @@ impl<'a, C> ProjectLocationEntryGroupEntryGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5065,25 +4993,15 @@ impl<'a, C> ProjectLocationEntryGroupEntryGetIamPolicyCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5091,13 +5009,15 @@ impl<'a, C> ProjectLocationEntryGroupEntryGetIamPolicyCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5356,25 +5276,15 @@ impl<'a, C> ProjectLocationEntryGroupEntryListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5382,13 +5292,15 @@ impl<'a, C> ProjectLocationEntryGroupEntryListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5670,25 +5582,15 @@ impl<'a, C> ProjectLocationEntryGroupEntryPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5696,13 +5598,15 @@ impl<'a, C> ProjectLocationEntryGroupEntryPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5974,25 +5878,15 @@ impl<'a, C> ProjectLocationEntryGroupEntryTestIamPermissionCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6000,13 +5894,15 @@ impl<'a, C> ProjectLocationEntryGroupEntryTestIamPermissionCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6271,25 +6167,15 @@ impl<'a, C> ProjectLocationEntryGroupTagCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6297,13 +6183,15 @@ impl<'a, C> ProjectLocationEntryGroupTagCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6547,25 +6435,15 @@ impl<'a, C> ProjectLocationEntryGroupTagDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6573,13 +6451,15 @@ impl<'a, C> ProjectLocationEntryGroupTagDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6824,25 +6704,15 @@ impl<'a, C> ProjectLocationEntryGroupTagListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6850,13 +6720,15 @@ impl<'a, C> ProjectLocationEntryGroupTagListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7131,25 +7003,15 @@ impl<'a, C> ProjectLocationEntryGroupTagPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7157,13 +7019,15 @@ impl<'a, C> ProjectLocationEntryGroupTagPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7440,25 +7304,15 @@ impl<'a, C> ProjectLocationEntryGroupCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7466,13 +7320,15 @@ impl<'a, C> ProjectLocationEntryGroupCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7728,25 +7584,15 @@ impl<'a, C> ProjectLocationEntryGroupDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7754,13 +7600,15 @@ impl<'a, C> ProjectLocationEntryGroupDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8007,25 +7855,15 @@ impl<'a, C> ProjectLocationEntryGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8033,13 +7871,15 @@ impl<'a, C> ProjectLocationEntryGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8302,25 +8142,15 @@ impl<'a, C> ProjectLocationEntryGroupGetIamPolicyCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8328,13 +8158,15 @@ impl<'a, C> ProjectLocationEntryGroupGetIamPolicyCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8588,25 +8420,15 @@ impl<'a, C> ProjectLocationEntryGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8614,13 +8436,15 @@ impl<'a, C> ProjectLocationEntryGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8895,25 +8719,15 @@ impl<'a, C> ProjectLocationEntryGroupPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8921,13 +8735,15 @@ impl<'a, C> ProjectLocationEntryGroupPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9199,25 +9015,15 @@ impl<'a, C> ProjectLocationEntryGroupSetIamPolicyCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9225,13 +9031,15 @@ impl<'a, C> ProjectLocationEntryGroupSetIamPolicyCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9496,25 +9304,15 @@ impl<'a, C> ProjectLocationEntryGroupTestIamPermissionCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9522,13 +9320,15 @@ impl<'a, C> ProjectLocationEntryGroupTestIamPermissionCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9793,25 +9593,15 @@ impl<'a, C> ProjectLocationTagTemplateFieldEnumValueRenameCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9819,13 +9609,15 @@ impl<'a, C> ProjectLocationTagTemplateFieldEnumValueRenameCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10095,25 +9887,15 @@ impl<'a, C> ProjectLocationTagTemplateFieldCreateCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10121,13 +9903,15 @@ impl<'a, C> ProjectLocationTagTemplateFieldCreateCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10383,25 +10167,15 @@ impl<'a, C> ProjectLocationTagTemplateFieldDeleteCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10409,13 +10183,15 @@ impl<'a, C> ProjectLocationTagTemplateFieldDeleteCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10683,25 +10459,15 @@ impl<'a, C> ProjectLocationTagTemplateFieldPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10709,13 +10475,15 @@ impl<'a, C> ProjectLocationTagTemplateFieldPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10987,25 +10755,15 @@ impl<'a, C> ProjectLocationTagTemplateFieldRenameCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11013,13 +10771,15 @@ impl<'a, C> ProjectLocationTagTemplateFieldRenameCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11289,25 +11049,15 @@ impl<'a, C> ProjectLocationTagTemplateCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11315,13 +11065,15 @@ impl<'a, C> ProjectLocationTagTemplateCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11577,25 +11329,15 @@ impl<'a, C> ProjectLocationTagTemplateDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11603,13 +11345,15 @@ impl<'a, C> ProjectLocationTagTemplateDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11851,25 +11595,15 @@ impl<'a, C> ProjectLocationTagTemplateGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11877,13 +11611,15 @@ impl<'a, C> ProjectLocationTagTemplateGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12139,25 +11875,15 @@ impl<'a, C> ProjectLocationTagTemplateGetIamPolicyCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12165,13 +11891,15 @@ impl<'a, C> ProjectLocationTagTemplateGetIamPolicyCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12441,25 +12169,15 @@ impl<'a, C> ProjectLocationTagTemplatePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12467,13 +12185,15 @@ impl<'a, C> ProjectLocationTagTemplatePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12745,25 +12465,15 @@ impl<'a, C> ProjectLocationTagTemplateSetIamPolicyCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12771,13 +12481,15 @@ impl<'a, C> ProjectLocationTagTemplateSetIamPolicyCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13042,25 +12754,15 @@ impl<'a, C> ProjectLocationTagTemplateTestIamPermissionCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13068,13 +12770,15 @@ impl<'a, C> ProjectLocationTagTemplateTestIamPermissionCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13339,25 +13043,15 @@ impl<'a, C> ProjectLocationTaxonomyPolicyTagCreateCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13365,13 +13059,15 @@ impl<'a, C> ProjectLocationTaxonomyPolicyTagCreateCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13615,25 +13311,15 @@ impl<'a, C> ProjectLocationTaxonomyPolicyTagDeleteCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13641,13 +13327,15 @@ impl<'a, C> ProjectLocationTaxonomyPolicyTagDeleteCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13882,25 +13570,15 @@ impl<'a, C> ProjectLocationTaxonomyPolicyTagGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13908,13 +13586,15 @@ impl<'a, C> ProjectLocationTaxonomyPolicyTagGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14170,25 +13850,15 @@ impl<'a, C> ProjectLocationTaxonomyPolicyTagGetIamPolicyCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14196,13 +13866,15 @@ impl<'a, C> ProjectLocationTaxonomyPolicyTagGetIamPolicyCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14456,25 +14128,15 @@ impl<'a, C> ProjectLocationTaxonomyPolicyTagListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14482,13 +14144,15 @@ impl<'a, C> ProjectLocationTaxonomyPolicyTagListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14763,25 +14427,15 @@ impl<'a, C> ProjectLocationTaxonomyPolicyTagPatchCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14789,13 +14443,15 @@ impl<'a, C> ProjectLocationTaxonomyPolicyTagPatchCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15067,25 +14723,15 @@ impl<'a, C> ProjectLocationTaxonomyPolicyTagSetIamPolicyCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15093,13 +14739,15 @@ impl<'a, C> ProjectLocationTaxonomyPolicyTagSetIamPolicyCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15364,25 +15012,15 @@ impl<'a, C> ProjectLocationTaxonomyPolicyTagTestIamPermissionCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15390,13 +15028,15 @@ impl<'a, C> ProjectLocationTaxonomyPolicyTagTestIamPermissionCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15661,25 +15301,15 @@ impl<'a, C> ProjectLocationTaxonomyCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15687,13 +15317,15 @@ impl<'a, C> ProjectLocationTaxonomyCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15937,25 +15569,15 @@ impl<'a, C> ProjectLocationTaxonomyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15963,13 +15585,15 @@ impl<'a, C> ProjectLocationTaxonomyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16216,25 +15840,15 @@ impl<'a, C> ProjectLocationTaxonomyExportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16242,13 +15856,15 @@ impl<'a, C> ProjectLocationTaxonomyExportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16498,25 +16114,15 @@ impl<'a, C> ProjectLocationTaxonomyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16524,13 +16130,15 @@ impl<'a, C> ProjectLocationTaxonomyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16786,25 +16394,15 @@ impl<'a, C> ProjectLocationTaxonomyGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16812,13 +16410,15 @@ impl<'a, C> ProjectLocationTaxonomyGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17083,25 +16683,15 @@ impl<'a, C> ProjectLocationTaxonomyImportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17109,13 +16699,15 @@ impl<'a, C> ProjectLocationTaxonomyImportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17369,25 +16961,15 @@ impl<'a, C> ProjectLocationTaxonomyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17395,13 +16977,15 @@ impl<'a, C> ProjectLocationTaxonomyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17676,25 +17260,15 @@ impl<'a, C> ProjectLocationTaxonomyPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17702,13 +17276,15 @@ impl<'a, C> ProjectLocationTaxonomyPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17980,25 +17556,15 @@ impl<'a, C> ProjectLocationTaxonomySetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18006,13 +17572,15 @@ impl<'a, C> ProjectLocationTaxonomySetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18277,25 +17845,15 @@ impl<'a, C> ProjectLocationTaxonomyTestIamPermissionCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18303,13 +17861,15 @@ impl<'a, C> ProjectLocationTaxonomyTestIamPermissionCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/datacatalog1_beta1/src/client.rs b/gen/datacatalog1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/datacatalog1_beta1/src/client.rs +++ b/gen/datacatalog1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/datafusion1-cli/src/main.rs b/gen/datafusion1-cli/src/main.rs index 09aba95b59..0ae1252301 100644 --- a/gen/datafusion1-cli/src/main.rs +++ b/gen/datafusion1-cli/src/main.rs @@ -398,7 +398,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "order-by", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -832,7 +832,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "include-unrevealed-locations", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "include-unrevealed-locations", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1082,7 +1082,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1144,7 +1144,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["latest-patch-only", "page-token", "page-size"].iter().map(|v|*v)); + v.extend(["latest-patch-only", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/datafusion1/src/api.rs b/gen/datafusion1/src/api.rs index cdf8c24d99..f681edef27 100644 --- a/gen/datafusion1/src/api.rs +++ b/gen/datafusion1/src/api.rs @@ -1190,25 +1190,15 @@ impl<'a, C> ProjectLocationInstanceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1216,13 +1206,15 @@ impl<'a, C> ProjectLocationInstanceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1473,25 +1465,15 @@ impl<'a, C> ProjectLocationInstanceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1499,13 +1481,15 @@ impl<'a, C> ProjectLocationInstanceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1740,25 +1724,15 @@ impl<'a, C> ProjectLocationInstanceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1766,13 +1740,15 @@ impl<'a, C> ProjectLocationInstanceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2012,25 +1988,15 @@ impl<'a, C> ProjectLocationInstanceGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2038,13 +2004,15 @@ impl<'a, C> ProjectLocationInstanceGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2306,25 +2274,15 @@ impl<'a, C> ProjectLocationInstanceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2332,13 +2290,15 @@ impl<'a, C> ProjectLocationInstanceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2627,25 +2587,15 @@ impl<'a, C> ProjectLocationInstancePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2653,13 +2603,15 @@ impl<'a, C> ProjectLocationInstancePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2931,25 +2883,15 @@ impl<'a, C> ProjectLocationInstanceRestartCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2957,13 +2899,15 @@ impl<'a, C> ProjectLocationInstanceRestartCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3228,25 +3172,15 @@ impl<'a, C> ProjectLocationInstanceSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3254,13 +3188,15 @@ impl<'a, C> ProjectLocationInstanceSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3525,25 +3461,15 @@ impl<'a, C> ProjectLocationInstanceTestIamPermissionCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3551,13 +3477,15 @@ impl<'a, C> ProjectLocationInstanceTestIamPermissionCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3822,25 +3750,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3848,13 +3766,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4098,25 +4018,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4124,13 +4034,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4365,25 +4277,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4391,13 +4293,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4647,25 +4551,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4673,13 +4567,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4950,25 +4846,15 @@ impl<'a, C> ProjectLocationVersionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4976,13 +4862,15 @@ impl<'a, C> ProjectLocationVersionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5238,25 +5126,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5264,13 +5142,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5525,25 +5405,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5551,13 +5421,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/datafusion1/src/client.rs b/gen/datafusion1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/datafusion1/src/client.rs +++ b/gen/datafusion1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/datafusion1_beta1-cli/src/main.rs b/gen/datafusion1_beta1-cli/src/main.rs index 86a71d832e..65211888d0 100644 --- a/gen/datafusion1_beta1-cli/src/main.rs +++ b/gen/datafusion1_beta1-cli/src/main.rs @@ -398,7 +398,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "order-by", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1144,7 +1144,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size", "include-unrevealed-locations"].iter().map(|v|*v)); + v.extend(["filter", "include-unrevealed-locations", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1394,7 +1394,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1540,7 +1540,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "latest-patch-only"].iter().map(|v|*v)); + v.extend(["latest-patch-only", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/datafusion1_beta1/src/api.rs b/gen/datafusion1_beta1/src/api.rs index 1391703bb8..202ed15f82 100644 --- a/gen/datafusion1_beta1/src/api.rs +++ b/gen/datafusion1_beta1/src/api.rs @@ -1312,25 +1312,15 @@ impl<'a, C> ProjectLocationInstanceNamespaceGetIamPolicyCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1338,13 +1328,15 @@ impl<'a, C> ProjectLocationInstanceNamespaceGetIamPolicyCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1607,25 +1599,15 @@ impl<'a, C> ProjectLocationInstanceNamespaceSetIamPolicyCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1633,13 +1615,15 @@ impl<'a, C> ProjectLocationInstanceNamespaceSetIamPolicyCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1904,25 +1888,15 @@ impl<'a, C> ProjectLocationInstanceNamespaceTestIamPermissionCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1930,13 +1904,15 @@ impl<'a, C> ProjectLocationInstanceNamespaceTestIamPermissionCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2206,25 +2182,15 @@ impl<'a, C> ProjectLocationInstanceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2232,13 +2198,15 @@ impl<'a, C> ProjectLocationInstanceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2489,25 +2457,15 @@ impl<'a, C> ProjectLocationInstanceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2515,13 +2473,15 @@ impl<'a, C> ProjectLocationInstanceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2756,25 +2716,15 @@ impl<'a, C> ProjectLocationInstanceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2782,13 +2732,15 @@ impl<'a, C> ProjectLocationInstanceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3028,25 +2980,15 @@ impl<'a, C> ProjectLocationInstanceGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3054,13 +2996,15 @@ impl<'a, C> ProjectLocationInstanceGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3322,25 +3266,15 @@ impl<'a, C> ProjectLocationInstanceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3348,13 +3282,15 @@ impl<'a, C> ProjectLocationInstanceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3643,25 +3579,15 @@ impl<'a, C> ProjectLocationInstancePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3669,13 +3595,15 @@ impl<'a, C> ProjectLocationInstancePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3947,25 +3875,15 @@ impl<'a, C> ProjectLocationInstanceRestartCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3973,13 +3891,15 @@ impl<'a, C> ProjectLocationInstanceRestartCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4244,25 +4164,15 @@ impl<'a, C> ProjectLocationInstanceSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4270,13 +4180,15 @@ impl<'a, C> ProjectLocationInstanceSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4541,25 +4453,15 @@ impl<'a, C> ProjectLocationInstanceTestIamPermissionCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4567,13 +4469,15 @@ impl<'a, C> ProjectLocationInstanceTestIamPermissionCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4838,25 +4742,15 @@ impl<'a, C> ProjectLocationInstanceUpgradeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4864,13 +4758,15 @@ impl<'a, C> ProjectLocationInstanceUpgradeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5135,25 +5031,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5161,13 +5047,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5411,25 +5299,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5437,13 +5315,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5678,25 +5558,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5704,13 +5574,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5960,25 +5832,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5986,13 +5848,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6263,25 +6127,15 @@ impl<'a, C> ProjectLocationVersionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6289,13 +6143,15 @@ impl<'a, C> ProjectLocationVersionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6551,25 +6407,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6577,13 +6423,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6838,25 +6686,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6864,13 +6702,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7154,25 +6994,15 @@ impl<'a, C> ProjectLocationRemoveIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7180,13 +7010,15 @@ impl<'a, C> ProjectLocationRemoveIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/datafusion1_beta1/src/client.rs b/gen/datafusion1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/datafusion1_beta1/src/client.rs +++ b/gen/datafusion1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/datalabeling1_beta1-cli/src/main.rs b/gen/datalabeling1_beta1-cli/src/main.rs index 98b88fe496..95ebf2281b 100644 --- a/gen/datalabeling1_beta1-cli/src/main.rs +++ b/gen/datalabeling1_beta1-cli/src/main.rs @@ -262,7 +262,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -376,7 +376,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -546,7 +546,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1074,7 +1074,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1279,7 +1279,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1868,7 +1868,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2357,7 +2357,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2713,7 +2713,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2972,7 +2972,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3190,7 +3190,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/datalabeling1_beta1/src/api.rs b/gen/datalabeling1_beta1/src/api.rs index 5d8ab9e283..497c4d55ad 100644 --- a/gen/datalabeling1_beta1/src/api.rs +++ b/gen/datalabeling1_beta1/src/api.rs @@ -3467,25 +3467,15 @@ impl<'a, C> ProjectAnnotationSpecSetCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3493,13 +3483,15 @@ impl<'a, C> ProjectAnnotationSpecSetCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3743,25 +3735,15 @@ impl<'a, C> ProjectAnnotationSpecSetDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3769,13 +3751,15 @@ impl<'a, C> ProjectAnnotationSpecSetDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4010,25 +3994,15 @@ impl<'a, C> ProjectAnnotationSpecSetGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4036,13 +4010,15 @@ impl<'a, C> ProjectAnnotationSpecSetGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4292,25 +4268,15 @@ impl<'a, C> ProjectAnnotationSpecSetListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4318,13 +4284,15 @@ impl<'a, C> ProjectAnnotationSpecSetListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4580,25 +4548,15 @@ impl<'a, C> ProjectDatasetAnnotatedDatasetDataItemGetCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4606,13 +4564,15 @@ impl<'a, C> ProjectDatasetAnnotatedDatasetDataItemGetCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4862,25 +4822,15 @@ impl<'a, C> ProjectDatasetAnnotatedDatasetDataItemListCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4888,13 +4838,15 @@ impl<'a, C> ProjectDatasetAnnotatedDatasetDataItemListCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5155,25 +5107,15 @@ impl<'a, C> ProjectDatasetAnnotatedDatasetExampleGetCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5181,13 +5123,15 @@ impl<'a, C> ProjectDatasetAnnotatedDatasetExampleGetCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5444,25 +5388,15 @@ impl<'a, C> ProjectDatasetAnnotatedDatasetExampleListCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5470,13 +5404,15 @@ impl<'a, C> ProjectDatasetAnnotatedDatasetExampleListCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5753,25 +5689,15 @@ impl<'a, C> ProjectDatasetAnnotatedDatasetFeedbackThreadFeedbackMessageCreateCal return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5779,13 +5705,15 @@ impl<'a, C> ProjectDatasetAnnotatedDatasetFeedbackThreadFeedbackMessageCreateCal } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6029,25 +5957,15 @@ impl<'a, C> ProjectDatasetAnnotatedDatasetFeedbackThreadFeedbackMessageDeleteCal return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6055,13 +5973,15 @@ impl<'a, C> ProjectDatasetAnnotatedDatasetFeedbackThreadFeedbackMessageDeleteCal } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6296,25 +6216,15 @@ impl<'a, C> ProjectDatasetAnnotatedDatasetFeedbackThreadFeedbackMessageGetCall<' return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6322,13 +6232,15 @@ impl<'a, C> ProjectDatasetAnnotatedDatasetFeedbackThreadFeedbackMessageGetCall<' } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6573,25 +6485,15 @@ impl<'a, C> ProjectDatasetAnnotatedDatasetFeedbackThreadFeedbackMessageListCall< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6599,13 +6501,15 @@ impl<'a, C> ProjectDatasetAnnotatedDatasetFeedbackThreadFeedbackMessageListCall< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6854,25 +6758,15 @@ impl<'a, C> ProjectDatasetAnnotatedDatasetFeedbackThreadDeleteCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6880,13 +6774,15 @@ impl<'a, C> ProjectDatasetAnnotatedDatasetFeedbackThreadDeleteCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7121,25 +7017,15 @@ impl<'a, C> ProjectDatasetAnnotatedDatasetFeedbackThreadGetCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7147,13 +7033,15 @@ impl<'a, C> ProjectDatasetAnnotatedDatasetFeedbackThreadGetCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7398,25 +7286,15 @@ impl<'a, C> ProjectDatasetAnnotatedDatasetFeedbackThreadListCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7424,13 +7302,15 @@ impl<'a, C> ProjectDatasetAnnotatedDatasetFeedbackThreadListCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7679,25 +7559,15 @@ impl<'a, C> ProjectDatasetAnnotatedDatasetDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7705,13 +7575,15 @@ impl<'a, C> ProjectDatasetAnnotatedDatasetDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7946,25 +7818,15 @@ impl<'a, C> ProjectDatasetAnnotatedDatasetGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7972,13 +7834,15 @@ impl<'a, C> ProjectDatasetAnnotatedDatasetGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8228,25 +8092,15 @@ impl<'a, C> ProjectDatasetAnnotatedDatasetListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8254,13 +8108,15 @@ impl<'a, C> ProjectDatasetAnnotatedDatasetListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8516,25 +8372,15 @@ impl<'a, C> ProjectDatasetDataItemGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8542,13 +8388,15 @@ impl<'a, C> ProjectDatasetDataItemGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8798,25 +8646,15 @@ impl<'a, C> ProjectDatasetDataItemListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8824,13 +8662,15 @@ impl<'a, C> ProjectDatasetDataItemListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9107,25 +8947,15 @@ impl<'a, C> ProjectDatasetEvaluationExampleComparisonSearchCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9133,13 +8963,15 @@ impl<'a, C> ProjectDatasetEvaluationExampleComparisonSearchCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9383,25 +9215,15 @@ impl<'a, C> ProjectDatasetEvaluationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9409,13 +9231,15 @@ impl<'a, C> ProjectDatasetEvaluationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9671,25 +9495,15 @@ impl<'a, C> ProjectDatasetImageLabelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9697,13 +9511,15 @@ impl<'a, C> ProjectDatasetImageLabelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9968,25 +9784,15 @@ impl<'a, C> ProjectDatasetTextLabelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9994,13 +9800,15 @@ impl<'a, C> ProjectDatasetTextLabelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10265,25 +10073,15 @@ impl<'a, C> ProjectDatasetVideoLabelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10291,13 +10089,15 @@ impl<'a, C> ProjectDatasetVideoLabelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10562,25 +10362,15 @@ impl<'a, C> ProjectDatasetCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10588,13 +10378,15 @@ impl<'a, C> ProjectDatasetCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10838,25 +10630,15 @@ impl<'a, C> ProjectDatasetDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10864,13 +10646,15 @@ impl<'a, C> ProjectDatasetDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11126,25 +10910,15 @@ impl<'a, C> ProjectDatasetExportDataCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11152,13 +10926,15 @@ impl<'a, C> ProjectDatasetExportDataCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11402,25 +11178,15 @@ impl<'a, C> ProjectDatasetGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11428,13 +11194,15 @@ impl<'a, C> ProjectDatasetGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11690,25 +11458,15 @@ impl<'a, C> ProjectDatasetImportDataCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11716,13 +11474,15 @@ impl<'a, C> ProjectDatasetImportDataCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11981,25 +11741,15 @@ impl<'a, C> ProjectDatasetListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12007,13 +11757,15 @@ impl<'a, C> ProjectDatasetListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12290,25 +12042,15 @@ impl<'a, C> ProjectEvaluationJobCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12316,13 +12058,15 @@ impl<'a, C> ProjectEvaluationJobCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12566,25 +12310,15 @@ impl<'a, C> ProjectEvaluationJobDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12592,13 +12326,15 @@ impl<'a, C> ProjectEvaluationJobDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12833,25 +12569,15 @@ impl<'a, C> ProjectEvaluationJobGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12859,13 +12585,15 @@ impl<'a, C> ProjectEvaluationJobGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13115,25 +12843,15 @@ impl<'a, C> ProjectEvaluationJobListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13141,13 +12859,15 @@ impl<'a, C> ProjectEvaluationJobListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13429,25 +13149,15 @@ impl<'a, C> ProjectEvaluationJobPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13455,13 +13165,15 @@ impl<'a, C> ProjectEvaluationJobPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13733,25 +13445,15 @@ impl<'a, C> ProjectEvaluationJobPauseCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13759,13 +13461,15 @@ impl<'a, C> ProjectEvaluationJobPauseCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14030,25 +13734,15 @@ impl<'a, C> ProjectEvaluationJobResumeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14056,13 +13750,15 @@ impl<'a, C> ProjectEvaluationJobResumeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14321,25 +14017,15 @@ impl<'a, C> ProjectEvaluationSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14347,13 +14033,15 @@ impl<'a, C> ProjectEvaluationSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14630,25 +14318,15 @@ impl<'a, C> ProjectInstructionCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14656,13 +14334,15 @@ impl<'a, C> ProjectInstructionCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14906,25 +14586,15 @@ impl<'a, C> ProjectInstructionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14932,13 +14602,15 @@ impl<'a, C> ProjectInstructionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15173,25 +14845,15 @@ impl<'a, C> ProjectInstructionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15199,13 +14861,15 @@ impl<'a, C> ProjectInstructionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15455,25 +15119,15 @@ impl<'a, C> ProjectInstructionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15481,13 +15135,15 @@ impl<'a, C> ProjectInstructionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15743,25 +15399,15 @@ impl<'a, C> ProjectOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15769,13 +15415,15 @@ impl<'a, C> ProjectOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16010,25 +15658,15 @@ impl<'a, C> ProjectOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16036,13 +15674,15 @@ impl<'a, C> ProjectOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16277,25 +15917,15 @@ impl<'a, C> ProjectOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16303,13 +15933,15 @@ impl<'a, C> ProjectOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16559,25 +16191,15 @@ impl<'a, C> ProjectOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16585,13 +16207,15 @@ impl<'a, C> ProjectOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/datalabeling1_beta1/src/client.rs b/gen/datalabeling1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/datalabeling1_beta1/src/client.rs +++ b/gen/datalabeling1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/datamigration1-cli/src/main.rs b/gen/datamigration1-cli/src/main.rs index 6c3b9dc9e5..bcd73fc69b 100644 --- a/gen/datamigration1-cli/src/main.rs +++ b/gen/datamigration1-cli/src/main.rs @@ -148,7 +148,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["request-id", "connection-profile-id"].iter().map(|v|*v)); + v.extend(["connection-profile-id", "request-id"].iter().map(|v|*v)); v } )); } } @@ -207,7 +207,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["request-id", "force"].iter().map(|v|*v)); + v.extend(["force", "request-id"].iter().map(|v|*v)); v } )); } } @@ -380,7 +380,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["order-by", "page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -806,7 +806,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "page-token", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -921,7 +921,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["request-id", "migration-job-id"].iter().map(|v|*v)); + v.extend(["migration-job-id", "request-id"].iter().map(|v|*v)); v } )); } } @@ -980,7 +980,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["request-id", "force"].iter().map(|v|*v)); + v.extend(["force", "request-id"].iter().map(|v|*v)); v } )); } } @@ -1243,7 +1243,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["order-by", "page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2284,7 +2284,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "page-token", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/datamigration1/src/api.rs b/gen/datamigration1/src/api.rs index 108a0526ad..ceb2f7ca1d 100644 --- a/gen/datamigration1/src/api.rs +++ b/gen/datamigration1/src/api.rs @@ -1842,25 +1842,15 @@ impl<'a, C> ProjectLocationConnectionProfileCreateCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1868,13 +1858,15 @@ impl<'a, C> ProjectLocationConnectionProfileCreateCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2142,25 +2134,15 @@ impl<'a, C> ProjectLocationConnectionProfileDeleteCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2168,13 +2150,15 @@ impl<'a, C> ProjectLocationConnectionProfileDeleteCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2423,25 +2407,15 @@ impl<'a, C> ProjectLocationConnectionProfileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2449,13 +2423,15 @@ impl<'a, C> ProjectLocationConnectionProfileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2695,25 +2671,15 @@ impl<'a, C> ProjectLocationConnectionProfileGetIamPolicyCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2721,13 +2687,15 @@ impl<'a, C> ProjectLocationConnectionProfileGetIamPolicyCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2989,25 +2957,15 @@ impl<'a, C> ProjectLocationConnectionProfileListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3015,13 +2973,15 @@ impl<'a, C> ProjectLocationConnectionProfileListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3315,25 +3275,15 @@ impl<'a, C> ProjectLocationConnectionProfilePatchCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3341,13 +3291,15 @@ impl<'a, C> ProjectLocationConnectionProfilePatchCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3626,25 +3578,15 @@ impl<'a, C> ProjectLocationConnectionProfileSetIamPolicyCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3652,13 +3594,15 @@ impl<'a, C> ProjectLocationConnectionProfileSetIamPolicyCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3923,25 +3867,15 @@ impl<'a, C> ProjectLocationConnectionProfileTestIamPermissionCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3949,13 +3883,15 @@ impl<'a, C> ProjectLocationConnectionProfileTestIamPermissionCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4230,25 +4166,15 @@ impl<'a, C> ProjectLocationMigrationJobCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4256,13 +4182,15 @@ impl<'a, C> ProjectLocationMigrationJobCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4530,25 +4458,15 @@ impl<'a, C> ProjectLocationMigrationJobDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4556,13 +4474,15 @@ impl<'a, C> ProjectLocationMigrationJobDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4832,25 +4752,15 @@ impl<'a, C> ProjectLocationMigrationJobGenerateSshScriptCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4858,13 +4768,15 @@ impl<'a, C> ProjectLocationMigrationJobGenerateSshScriptCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5108,25 +5020,15 @@ impl<'a, C> ProjectLocationMigrationJobGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5134,13 +5036,15 @@ impl<'a, C> ProjectLocationMigrationJobGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5380,25 +5284,15 @@ impl<'a, C> ProjectLocationMigrationJobGetIamPolicyCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5406,13 +5300,15 @@ impl<'a, C> ProjectLocationMigrationJobGetIamPolicyCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5674,25 +5570,15 @@ impl<'a, C> ProjectLocationMigrationJobListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5700,13 +5586,15 @@ impl<'a, C> ProjectLocationMigrationJobListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6000,25 +5888,15 @@ impl<'a, C> ProjectLocationMigrationJobPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6026,13 +5904,15 @@ impl<'a, C> ProjectLocationMigrationJobPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6311,25 +6191,15 @@ impl<'a, C> ProjectLocationMigrationJobPromoteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6337,13 +6207,15 @@ impl<'a, C> ProjectLocationMigrationJobPromoteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6608,25 +6480,15 @@ impl<'a, C> ProjectLocationMigrationJobRestartCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6634,13 +6496,15 @@ impl<'a, C> ProjectLocationMigrationJobRestartCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6905,25 +6769,15 @@ impl<'a, C> ProjectLocationMigrationJobResumeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6931,13 +6785,15 @@ impl<'a, C> ProjectLocationMigrationJobResumeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7202,25 +7058,15 @@ impl<'a, C> ProjectLocationMigrationJobSetIamPolicyCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7228,13 +7074,15 @@ impl<'a, C> ProjectLocationMigrationJobSetIamPolicyCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7499,25 +7347,15 @@ impl<'a, C> ProjectLocationMigrationJobStartCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7525,13 +7363,15 @@ impl<'a, C> ProjectLocationMigrationJobStartCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7796,25 +7636,15 @@ impl<'a, C> ProjectLocationMigrationJobStopCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7822,13 +7652,15 @@ impl<'a, C> ProjectLocationMigrationJobStopCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8093,25 +7925,15 @@ impl<'a, C> ProjectLocationMigrationJobTestIamPermissionCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8119,13 +7941,15 @@ impl<'a, C> ProjectLocationMigrationJobTestIamPermissionCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8390,25 +8214,15 @@ impl<'a, C> ProjectLocationMigrationJobVerifyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8416,13 +8230,15 @@ impl<'a, C> ProjectLocationMigrationJobVerifyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8687,25 +8503,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8713,13 +8519,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8963,25 +8771,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8989,13 +8787,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9230,25 +9030,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9256,13 +9046,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9512,25 +9304,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9538,13 +9320,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9800,25 +9584,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9826,13 +9600,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10082,25 +9858,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10108,13 +9874,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/datamigration1/src/client.rs b/gen/datamigration1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/datamigration1/src/client.rs +++ b/gen/datamigration1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/dataproc1-cli/src/main.rs b/gen/dataproc1-cli/src/main.rs index 4090e0e1d6..b3072eac81 100644 --- a/gen/dataproc1-cli/src/main.rs +++ b/gen/dataproc1-cli/src/main.rs @@ -2534,7 +2534,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["request-id", "cluster-uuid"].iter().map(|v|*v)); + v.extend(["cluster-uuid", "request-id"].iter().map(|v|*v)); v } )); } } @@ -2903,7 +2903,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3091,7 +3091,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["graceful-decommission-timeout", "update-mask", "request-id"].iter().map(|v|*v)); + v.extend(["graceful-decommission-timeout", "request-id", "update-mask"].iter().map(|v|*v)); v } )); } } @@ -3775,7 +3775,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["job-state-matcher", "cluster-name", "page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["cluster-name", "filter", "job-state-matcher", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -4723,7 +4723,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/dataproc1/src/api.rs b/gen/dataproc1/src/api.rs index d89dfaa318..7da576a010 100644 --- a/gen/dataproc1/src/api.rs +++ b/gen/dataproc1/src/api.rs @@ -3481,25 +3481,15 @@ impl<'a, C> ProjectLocationAutoscalingPolicyCreateCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3507,13 +3497,15 @@ impl<'a, C> ProjectLocationAutoscalingPolicyCreateCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3757,25 +3749,15 @@ impl<'a, C> ProjectLocationAutoscalingPolicyDeleteCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3783,13 +3765,15 @@ impl<'a, C> ProjectLocationAutoscalingPolicyDeleteCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4024,25 +4008,15 @@ impl<'a, C> ProjectLocationAutoscalingPolicyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4050,13 +4024,15 @@ impl<'a, C> ProjectLocationAutoscalingPolicyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4312,25 +4288,15 @@ impl<'a, C> ProjectLocationAutoscalingPolicyGetIamPolicyCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4338,13 +4304,15 @@ impl<'a, C> ProjectLocationAutoscalingPolicyGetIamPolicyCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4598,25 +4566,15 @@ impl<'a, C> ProjectLocationAutoscalingPolicyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4624,13 +4582,15 @@ impl<'a, C> ProjectLocationAutoscalingPolicyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4900,25 +4860,15 @@ impl<'a, C> ProjectLocationAutoscalingPolicySetIamPolicyCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4926,13 +4876,15 @@ impl<'a, C> ProjectLocationAutoscalingPolicySetIamPolicyCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5197,25 +5149,15 @@ impl<'a, C> ProjectLocationAutoscalingPolicyTestIamPermissionCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5223,13 +5165,15 @@ impl<'a, C> ProjectLocationAutoscalingPolicyTestIamPermissionCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5494,25 +5438,15 @@ impl<'a, C> ProjectLocationAutoscalingPolicyUpdateCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5520,13 +5454,15 @@ impl<'a, C> ProjectLocationAutoscalingPolicyUpdateCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5791,25 +5727,15 @@ impl<'a, C> ProjectLocationWorkflowTemplateCreateCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5817,13 +5743,15 @@ impl<'a, C> ProjectLocationWorkflowTemplateCreateCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6072,25 +6000,15 @@ impl<'a, C> ProjectLocationWorkflowTemplateDeleteCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6098,13 +6016,15 @@ impl<'a, C> ProjectLocationWorkflowTemplateDeleteCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6351,25 +6271,15 @@ impl<'a, C> ProjectLocationWorkflowTemplateGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6377,13 +6287,15 @@ impl<'a, C> ProjectLocationWorkflowTemplateGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6646,25 +6558,15 @@ impl<'a, C> ProjectLocationWorkflowTemplateGetIamPolicyCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6672,13 +6574,15 @@ impl<'a, C> ProjectLocationWorkflowTemplateGetIamPolicyCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6943,25 +6847,15 @@ impl<'a, C> ProjectLocationWorkflowTemplateInstantiateCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6969,13 +6863,15 @@ impl<'a, C> ProjectLocationWorkflowTemplateInstantiateCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7245,25 +7141,15 @@ impl<'a, C> ProjectLocationWorkflowTemplateInstantiateInlineCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7271,13 +7157,15 @@ impl<'a, C> ProjectLocationWorkflowTemplateInstantiateInlineCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7538,25 +7426,15 @@ impl<'a, C> ProjectLocationWorkflowTemplateListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7564,13 +7442,15 @@ impl<'a, C> ProjectLocationWorkflowTemplateListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7840,25 +7720,15 @@ impl<'a, C> ProjectLocationWorkflowTemplateSetIamPolicyCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7866,13 +7736,15 @@ impl<'a, C> ProjectLocationWorkflowTemplateSetIamPolicyCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8137,25 +8009,15 @@ impl<'a, C> ProjectLocationWorkflowTemplateTestIamPermissionCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8163,13 +8025,15 @@ impl<'a, C> ProjectLocationWorkflowTemplateTestIamPermissionCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8434,25 +8298,15 @@ impl<'a, C> ProjectLocationWorkflowTemplateUpdateCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8460,13 +8314,15 @@ impl<'a, C> ProjectLocationWorkflowTemplateUpdateCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8731,25 +8587,15 @@ impl<'a, C> ProjectRegionAutoscalingPolicyCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8757,13 +8603,15 @@ impl<'a, C> ProjectRegionAutoscalingPolicyCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9007,25 +8855,15 @@ impl<'a, C> ProjectRegionAutoscalingPolicyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9033,13 +8871,15 @@ impl<'a, C> ProjectRegionAutoscalingPolicyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9274,25 +9114,15 @@ impl<'a, C> ProjectRegionAutoscalingPolicyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9300,13 +9130,15 @@ impl<'a, C> ProjectRegionAutoscalingPolicyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9562,25 +9394,15 @@ impl<'a, C> ProjectRegionAutoscalingPolicyGetIamPolicyCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9588,13 +9410,15 @@ impl<'a, C> ProjectRegionAutoscalingPolicyGetIamPolicyCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9848,25 +9672,15 @@ impl<'a, C> ProjectRegionAutoscalingPolicyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9874,13 +9688,15 @@ impl<'a, C> ProjectRegionAutoscalingPolicyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10150,25 +9966,15 @@ impl<'a, C> ProjectRegionAutoscalingPolicySetIamPolicyCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10176,13 +9982,15 @@ impl<'a, C> ProjectRegionAutoscalingPolicySetIamPolicyCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10447,25 +10255,15 @@ impl<'a, C> ProjectRegionAutoscalingPolicyTestIamPermissionCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10473,13 +10271,15 @@ impl<'a, C> ProjectRegionAutoscalingPolicyTestIamPermissionCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10744,25 +10544,15 @@ impl<'a, C> ProjectRegionAutoscalingPolicyUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10770,13 +10560,15 @@ impl<'a, C> ProjectRegionAutoscalingPolicyUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11044,25 +10836,15 @@ impl<'a, C> ProjectRegionClusterCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11070,13 +10852,15 @@ impl<'a, C> ProjectRegionClusterCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11347,25 +11131,15 @@ impl<'a, C> ProjectRegionClusterDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11373,13 +11147,15 @@ impl<'a, C> ProjectRegionClusterDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11669,25 +11445,15 @@ impl<'a, C> ProjectRegionClusterDiagnoseCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11695,13 +11461,15 @@ impl<'a, C> ProjectRegionClusterDiagnoseCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11965,25 +11733,15 @@ impl<'a, C> ProjectRegionClusterGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11991,13 +11749,15 @@ impl<'a, C> ProjectRegionClusterGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12273,25 +12033,15 @@ impl<'a, C> ProjectRegionClusterGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12299,13 +12049,15 @@ impl<'a, C> ProjectRegionClusterGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12574,25 +12326,15 @@ impl<'a, C> ProjectRegionClusterInjectCredentialCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12600,13 +12342,15 @@ impl<'a, C> ProjectRegionClusterInjectCredentialCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12883,25 +12627,15 @@ impl<'a, C> ProjectRegionClusterListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12909,13 +12643,15 @@ impl<'a, C> ProjectRegionClusterListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13217,25 +12953,15 @@ impl<'a, C> ProjectRegionClusterPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13243,13 +12969,15 @@ impl<'a, C> ProjectRegionClusterPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13555,25 +13283,15 @@ impl<'a, C> ProjectRegionClusterSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13581,13 +13299,15 @@ impl<'a, C> ProjectRegionClusterSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13852,25 +13572,15 @@ impl<'a, C> ProjectRegionClusterStartCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13878,13 +13588,15 @@ impl<'a, C> ProjectRegionClusterStartCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14169,25 +13881,15 @@ impl<'a, C> ProjectRegionClusterStopCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14195,13 +13897,15 @@ impl<'a, C> ProjectRegionClusterStopCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14486,25 +14190,15 @@ impl<'a, C> ProjectRegionClusterTestIamPermissionCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14512,13 +14206,15 @@ impl<'a, C> ProjectRegionClusterTestIamPermissionCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14783,25 +14479,15 @@ impl<'a, C> ProjectRegionJobCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14809,13 +14495,15 @@ impl<'a, C> ProjectRegionJobCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15079,25 +14767,15 @@ impl<'a, C> ProjectRegionJobDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15105,13 +14783,15 @@ impl<'a, C> ProjectRegionJobDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15366,25 +15046,15 @@ impl<'a, C> ProjectRegionJobGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15392,13 +15062,15 @@ impl<'a, C> ProjectRegionJobGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15674,25 +15346,15 @@ impl<'a, C> ProjectRegionJobGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15700,13 +15362,15 @@ impl<'a, C> ProjectRegionJobGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15973,25 +15637,15 @@ impl<'a, C> ProjectRegionJobListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15999,13 +15653,15 @@ impl<'a, C> ProjectRegionJobListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16311,25 +15967,15 @@ impl<'a, C> ProjectRegionJobPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16337,13 +15983,15 @@ impl<'a, C> ProjectRegionJobPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16635,25 +16283,15 @@ impl<'a, C> ProjectRegionJobSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16661,13 +16299,15 @@ impl<'a, C> ProjectRegionJobSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16930,25 +16570,15 @@ impl<'a, C> ProjectRegionJobSubmitCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16956,13 +16586,15 @@ impl<'a, C> ProjectRegionJobSubmitCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17235,25 +16867,15 @@ impl<'a, C> ProjectRegionJobSubmitAsOperationCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17261,13 +16883,15 @@ impl<'a, C> ProjectRegionJobSubmitAsOperationCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17542,25 +17166,15 @@ impl<'a, C> ProjectRegionJobTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17568,13 +17182,15 @@ impl<'a, C> ProjectRegionJobTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17818,25 +17434,15 @@ impl<'a, C> ProjectRegionOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17844,13 +17450,15 @@ impl<'a, C> ProjectRegionOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18085,25 +17693,15 @@ impl<'a, C> ProjectRegionOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18111,13 +17709,15 @@ impl<'a, C> ProjectRegionOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18352,25 +17952,15 @@ impl<'a, C> ProjectRegionOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18378,13 +17968,15 @@ impl<'a, C> ProjectRegionOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18640,25 +18232,15 @@ impl<'a, C> ProjectRegionOperationGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18666,13 +18248,15 @@ impl<'a, C> ProjectRegionOperationGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18931,25 +18515,15 @@ impl<'a, C> ProjectRegionOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18957,13 +18531,15 @@ impl<'a, C> ProjectRegionOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19240,25 +18816,15 @@ impl<'a, C> ProjectRegionOperationSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19266,13 +18832,15 @@ impl<'a, C> ProjectRegionOperationSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19537,25 +19105,15 @@ impl<'a, C> ProjectRegionOperationTestIamPermissionCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19563,13 +19121,15 @@ impl<'a, C> ProjectRegionOperationTestIamPermissionCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19834,25 +19394,15 @@ impl<'a, C> ProjectRegionWorkflowTemplateCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19860,13 +19410,15 @@ impl<'a, C> ProjectRegionWorkflowTemplateCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20115,25 +19667,15 @@ impl<'a, C> ProjectRegionWorkflowTemplateDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20141,13 +19683,15 @@ impl<'a, C> ProjectRegionWorkflowTemplateDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20394,25 +19938,15 @@ impl<'a, C> ProjectRegionWorkflowTemplateGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20420,13 +19954,15 @@ impl<'a, C> ProjectRegionWorkflowTemplateGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20689,25 +20225,15 @@ impl<'a, C> ProjectRegionWorkflowTemplateGetIamPolicyCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20715,13 +20241,15 @@ impl<'a, C> ProjectRegionWorkflowTemplateGetIamPolicyCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20986,25 +20514,15 @@ impl<'a, C> ProjectRegionWorkflowTemplateInstantiateCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21012,13 +20530,15 @@ impl<'a, C> ProjectRegionWorkflowTemplateInstantiateCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21288,25 +20808,15 @@ impl<'a, C> ProjectRegionWorkflowTemplateInstantiateInlineCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21314,13 +20824,15 @@ impl<'a, C> ProjectRegionWorkflowTemplateInstantiateInlineCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21581,25 +21093,15 @@ impl<'a, C> ProjectRegionWorkflowTemplateListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21607,13 +21109,15 @@ impl<'a, C> ProjectRegionWorkflowTemplateListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21883,25 +21387,15 @@ impl<'a, C> ProjectRegionWorkflowTemplateSetIamPolicyCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21909,13 +21403,15 @@ impl<'a, C> ProjectRegionWorkflowTemplateSetIamPolicyCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22180,25 +21676,15 @@ impl<'a, C> ProjectRegionWorkflowTemplateTestIamPermissionCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22206,13 +21692,15 @@ impl<'a, C> ProjectRegionWorkflowTemplateTestIamPermissionCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22477,25 +21965,15 @@ impl<'a, C> ProjectRegionWorkflowTemplateUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22503,13 +21981,15 @@ impl<'a, C> ProjectRegionWorkflowTemplateUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/dataproc1/src/client.rs b/gen/dataproc1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/dataproc1/src/client.rs +++ b/gen/dataproc1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/datastore1-cli/src/main.rs b/gen/datastore1-cli/src/main.rs index 2d6bf22617..24ba052bad 100644 --- a/gen/datastore1-cli/src/main.rs +++ b/gen/datastore1-cli/src/main.rs @@ -694,7 +694,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -998,7 +998,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/datastore1/src/api.rs b/gen/datastore1/src/api.rs index e750f3517b..fb74b3a100 100644 --- a/gen/datastore1/src/api.rs +++ b/gen/datastore1/src/api.rs @@ -1654,25 +1654,15 @@ impl<'a, C> ProjectIndexeCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1680,13 +1670,15 @@ impl<'a, C> ProjectIndexeCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1928,25 +1920,15 @@ impl<'a, C> ProjectIndexeDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1954,13 +1936,15 @@ impl<'a, C> ProjectIndexeDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2203,25 +2187,15 @@ impl<'a, C> ProjectIndexeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2229,13 +2203,15 @@ impl<'a, C> ProjectIndexeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2491,25 +2467,15 @@ impl<'a, C> ProjectIndexeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2517,13 +2483,15 @@ impl<'a, C> ProjectIndexeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2778,25 +2746,15 @@ impl<'a, C> ProjectOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2804,13 +2762,15 @@ impl<'a, C> ProjectOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3045,25 +3005,15 @@ impl<'a, C> ProjectOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3071,13 +3021,15 @@ impl<'a, C> ProjectOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3312,25 +3264,15 @@ impl<'a, C> ProjectOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3338,13 +3280,15 @@ impl<'a, C> ProjectOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3594,25 +3538,15 @@ impl<'a, C> ProjectOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3620,13 +3554,15 @@ impl<'a, C> ProjectOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3899,25 +3835,15 @@ impl<'a, C> ProjectAllocateIdCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3925,13 +3851,15 @@ impl<'a, C> ProjectAllocateIdCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4192,25 +4120,15 @@ impl<'a, C> ProjectBeginTransactionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4218,13 +4136,15 @@ impl<'a, C> ProjectBeginTransactionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4485,25 +4405,15 @@ impl<'a, C> ProjectCommitCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4511,13 +4421,15 @@ impl<'a, C> ProjectCommitCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4778,25 +4690,15 @@ impl<'a, C> ProjectExportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4804,13 +4706,15 @@ impl<'a, C> ProjectExportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5071,25 +4975,15 @@ impl<'a, C> ProjectImportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5097,13 +4991,15 @@ impl<'a, C> ProjectImportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5364,25 +5260,15 @@ impl<'a, C> ProjectLookupCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5390,13 +5276,15 @@ impl<'a, C> ProjectLookupCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5657,25 +5545,15 @@ impl<'a, C> ProjectReserveIdCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5683,13 +5561,15 @@ impl<'a, C> ProjectReserveIdCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5950,25 +5830,15 @@ impl<'a, C> ProjectRollbackCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5976,13 +5846,15 @@ impl<'a, C> ProjectRollbackCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6243,25 +6115,15 @@ impl<'a, C> ProjectRunQueryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6269,13 +6131,15 @@ impl<'a, C> ProjectRunQueryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/datastore1/src/client.rs b/gen/datastore1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/datastore1/src/client.rs +++ b/gen/datastore1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/datastore1_beta3/src/api.rs b/gen/datastore1_beta3/src/api.rs index 38c4f57b61..81d909dfcc 100644 --- a/gen/datastore1_beta3/src/api.rs +++ b/gen/datastore1_beta3/src/api.rs @@ -1252,25 +1252,15 @@ impl<'a, C> ProjectAllocateIdCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1278,13 +1268,15 @@ impl<'a, C> ProjectAllocateIdCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1545,25 +1537,15 @@ impl<'a, C> ProjectBeginTransactionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1571,13 +1553,15 @@ impl<'a, C> ProjectBeginTransactionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1838,25 +1822,15 @@ impl<'a, C> ProjectCommitCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1864,13 +1838,15 @@ impl<'a, C> ProjectCommitCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2131,25 +2107,15 @@ impl<'a, C> ProjectLookupCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2157,13 +2123,15 @@ impl<'a, C> ProjectLookupCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2424,25 +2392,15 @@ impl<'a, C> ProjectReserveIdCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2450,13 +2408,15 @@ impl<'a, C> ProjectReserveIdCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2717,25 +2677,15 @@ impl<'a, C> ProjectRollbackCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2743,13 +2693,15 @@ impl<'a, C> ProjectRollbackCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3010,25 +2962,15 @@ impl<'a, C> ProjectRunQueryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3036,13 +2978,15 @@ impl<'a, C> ProjectRunQueryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/datastore1_beta3/src/client.rs b/gen/datastore1_beta3/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/datastore1_beta3/src/client.rs +++ b/gen/datastore1_beta3/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/deploymentmanager2-cli/src/main.rs b/gen/deploymentmanager2-cli/src/main.rs index 589a3ee80e..f032c6dc57 100644 --- a/gen/deploymentmanager2-cli/src/main.rs +++ b/gen/deploymentmanager2-cli/src/main.rs @@ -381,7 +381,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["preview", "create-policy"].iter().map(|v|*v)); + v.extend(["create-policy", "preview"].iter().map(|v|*v)); v } )); } } @@ -446,7 +446,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "order-by", "page-token", "max-results"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token"].iter().map(|v|*v)); v } )); } } @@ -573,7 +573,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["delete-policy", "preview", "create-policy"].iter().map(|v|*v)); + v.extend(["create-policy", "delete-policy", "preview"].iter().map(|v|*v)); v } )); } } @@ -957,7 +957,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["delete-policy", "preview", "create-policy"].iter().map(|v|*v)); + v.extend(["create-policy", "delete-policy", "preview"].iter().map(|v|*v)); v } )); } } @@ -1074,7 +1074,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "order-by", "page-token", "max-results"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1191,7 +1191,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "order-by", "page-token", "max-results"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1308,7 +1308,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "order-by", "page-token", "max-results"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1373,7 +1373,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "order-by", "page-token", "max-results"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/deploymentmanager2/src/api.rs b/gen/deploymentmanager2/src/api.rs index 4d01401565..71dece66e1 100644 --- a/gen/deploymentmanager2/src/api.rs +++ b/gen/deploymentmanager2/src/api.rs @@ -1812,25 +1812,15 @@ impl<'a, C> DeploymentCancelPreviewCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1838,13 +1828,15 @@ impl<'a, C> DeploymentCancelPreviewCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2101,25 +2093,15 @@ impl<'a, C> DeploymentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2127,13 +2109,15 @@ impl<'a, C> DeploymentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2383,25 +2367,15 @@ impl<'a, C> DeploymentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2409,13 +2383,15 @@ impl<'a, C> DeploymentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2663,25 +2639,15 @@ impl<'a, C> DeploymentGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2689,13 +2655,15 @@ impl<'a, C> DeploymentGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2974,25 +2942,15 @@ impl<'a, C> DeploymentInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3000,13 +2958,15 @@ impl<'a, C> DeploymentInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3280,25 +3240,15 @@ impl<'a, C> DeploymentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3306,13 +3256,15 @@ impl<'a, C> DeploymentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3609,25 +3561,15 @@ impl<'a, C> DeploymentPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3635,13 +3577,15 @@ impl<'a, C> DeploymentPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3935,25 +3879,15 @@ impl<'a, C> DeploymentSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3961,13 +3895,15 @@ impl<'a, C> DeploymentSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4240,25 +4176,15 @@ impl<'a, C> DeploymentStopCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4266,13 +4192,15 @@ impl<'a, C> DeploymentStopCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4545,25 +4473,15 @@ impl<'a, C> DeploymentTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4571,13 +4489,15 @@ impl<'a, C> DeploymentTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4865,25 +4785,15 @@ impl<'a, C> DeploymentUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4891,13 +4801,15 @@ impl<'a, C> DeploymentUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5172,25 +5084,15 @@ impl<'a, C> ManifestGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5198,13 +5100,15 @@ impl<'a, C> ManifestGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5477,25 +5381,15 @@ impl<'a, C> ManifestListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5503,13 +5397,15 @@ impl<'a, C> ManifestListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5780,25 +5676,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5806,13 +5692,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6073,25 +5961,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6099,13 +5977,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6368,25 +6248,15 @@ impl<'a, C> ResourceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6394,13 +6264,15 @@ impl<'a, C> ResourceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6673,25 +6545,15 @@ impl<'a, C> ResourceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6699,13 +6561,15 @@ impl<'a, C> ResourceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6994,25 +6858,15 @@ impl<'a, C> TypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7020,13 +6874,15 @@ impl<'a, C> TypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/deploymentmanager2/src/client.rs b/gen/deploymentmanager2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/deploymentmanager2/src/client.rs +++ b/gen/deploymentmanager2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/deploymentmanager2_beta2-cli/src/main.rs b/gen/deploymentmanager2_beta2-cli/src/main.rs index 8a73c10d9b..51ebd60230 100644 --- a/gen/deploymentmanager2_beta2-cli/src/main.rs +++ b/gen/deploymentmanager2_beta2-cli/src/main.rs @@ -270,7 +270,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results", "filter"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -376,7 +376,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["delete-policy", "create-policy", "update-policy"].iter().map(|v|*v)); + v.extend(["create-policy", "delete-policy", "update-policy"].iter().map(|v|*v)); v } )); } } @@ -482,7 +482,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["delete-policy", "create-policy", "update-policy"].iter().map(|v|*v)); + v.extend(["create-policy", "delete-policy", "update-policy"].iter().map(|v|*v)); v } )); } } @@ -596,7 +596,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results", "filter"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -710,7 +710,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results", "filter"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -824,7 +824,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results", "filter"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -886,7 +886,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results", "filter"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/deploymentmanager2_beta2/src/api.rs b/gen/deploymentmanager2_beta2/src/api.rs index 4f5474522b..dc526221ba 100644 --- a/gen/deploymentmanager2_beta2/src/api.rs +++ b/gen/deploymentmanager2_beta2/src/api.rs @@ -1308,25 +1308,15 @@ impl<'a, C> DeploymentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1334,13 +1324,15 @@ impl<'a, C> DeploymentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1579,25 +1571,15 @@ impl<'a, C> DeploymentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1605,13 +1587,15 @@ impl<'a, C> DeploymentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1869,25 +1853,15 @@ impl<'a, C> DeploymentInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1895,13 +1869,15 @@ impl<'a, C> DeploymentInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2152,25 +2128,15 @@ impl<'a, C> DeploymentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2178,13 +2144,15 @@ impl<'a, C> DeploymentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2478,25 +2446,15 @@ impl<'a, C> DeploymentPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2504,13 +2462,15 @@ impl<'a, C> DeploymentPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2815,25 +2775,15 @@ impl<'a, C> DeploymentUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2841,13 +2791,15 @@ impl<'a, C> DeploymentUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3118,25 +3070,15 @@ impl<'a, C> ManifestGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3144,13 +3086,15 @@ impl<'a, C> ManifestGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3414,25 +3358,15 @@ impl<'a, C> ManifestListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3440,13 +3374,15 @@ impl<'a, C> ManifestListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3714,25 +3650,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3740,13 +3666,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3998,25 +3926,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4024,13 +3942,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4290,25 +4210,15 @@ impl<'a, C> ResourceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4316,13 +4226,15 @@ impl<'a, C> ResourceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4586,25 +4498,15 @@ impl<'a, C> ResourceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4612,13 +4514,15 @@ impl<'a, C> ResourceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4899,25 +4803,15 @@ impl<'a, C> TypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4925,13 +4819,15 @@ impl<'a, C> TypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/deploymentmanager2_beta2/src/client.rs b/gen/deploymentmanager2_beta2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/deploymentmanager2_beta2/src/client.rs +++ b/gen/deploymentmanager2_beta2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/dfareporting2d8-cli/src/main.rs b/gen/dfareporting2d8-cli/src/main.rs index 83111bc094..0a48a48bfd 100644 --- a/gen/dfareporting2d8-cli/src/main.rs +++ b/gen/dfareporting2d8-cli/src/main.rs @@ -508,7 +508,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "ids", "sort-field", "user-role-id", "subaccount-id", "active", "sort-order", "search-string", "max-results"].iter().map(|v|*v)); + v.extend(["active", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order", "subaccount-id", "user-role-id"].iter().map(|v|*v)); v } )); } } @@ -850,7 +850,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "ids", "sort-field", "active", "sort-order", "search-string", "max-results"].iter().map(|v|*v)); + v.extend(["active", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -1386,7 +1386,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "ssl-required", "type", "dynamic-click-tracker", "advertiser-id", "ids", "size-ids", "archived", "active", "campaign-ids", "placement-ids", "audience-segment-ids", "creative-ids", "ssl-compliant", "creative-optimization-configuration-ids", "sort-order", "overridden-event-tag-id", "sort-field", "compatibility", "search-string", "remarketing-list-ids", "landing-page-ids", "max-results"].iter().map(|v|*v)); + v.extend(["active", "advertiser-id", "archived", "audience-segment-ids", "campaign-ids", "compatibility", "creative-ids", "creative-optimization-configuration-ids", "dynamic-click-tracker", "ids", "landing-page-ids", "max-results", "overridden-event-tag-id", "page-token", "placement-ids", "remarketing-list-ids", "search-string", "size-ids", "sort-field", "sort-order", "ssl-compliant", "ssl-required", "type"].iter().map(|v|*v)); v } )); } } @@ -1941,7 +1941,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "ids", "sort-field", "sort-order", "search-string", "max-results"].iter().map(|v|*v)); + v.extend(["ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -2367,7 +2367,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "ids", "sort-field", "subaccount-id", "include-advertisers-without-groups-only", "sort-order", "floodlight-configuration-ids", "advertiser-group-ids", "only-parent", "search-string", "max-results", "status"].iter().map(|v|*v)); + v.extend(["advertiser-group-ids", "floodlight-configuration-ids", "ids", "include-advertisers-without-groups-only", "max-results", "only-parent", "page-token", "search-string", "sort-field", "sort-order", "status", "subaccount-id"].iter().map(|v|*v)); v } )); } } @@ -2785,7 +2785,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "sort-order", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -3056,7 +3056,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "ids", "sort-field", "advertiser-ids", "excluded-ids", "subaccount-id", "archived", "sort-order", "at-least-one-optimization-activity", "overridden-event-tag-id", "advertiser-group-ids", "search-string", "max-results"].iter().map(|v|*v)); + v.extend(["advertiser-group-ids", "advertiser-ids", "archived", "at-least-one-optimization-activity", "excluded-ids", "ids", "max-results", "overridden-event-tag-id", "page-token", "search-string", "sort-field", "sort-order", "subaccount-id"].iter().map(|v|*v)); v } )); } } @@ -3445,7 +3445,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-profile-ids", "object-type", "page-token", "max-change-time", "ids", "action", "min-change-time", "object-ids", "search-string", "max-results"].iter().map(|v|*v)); + v.extend(["action", "ids", "max-change-time", "max-results", "min-change-time", "object-ids", "object-type", "page-token", "search-string", "user-profile-ids"].iter().map(|v|*v)); v } )); } } @@ -3510,7 +3510,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["name-prefix", "country-dart-ids", "dart-ids", "region-dart-ids"].iter().map(|v|*v)); + v.extend(["country-dart-ids", "dart-ids", "name-prefix", "region-dart-ids"].iter().map(|v|*v)); v } )); } } @@ -3869,7 +3869,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "ids", "sort-field", "sort-order", "search-string", "max-results"].iter().map(|v|*v)); + v.extend(["ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -4680,7 +4680,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "ids", "sort-field", "sort-order", "search-string", "max-results"].iter().map(|v|*v)); + v.extend(["ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -5120,7 +5120,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "ids", "sort-field", "advertiser-ids", "sort-order", "search-string", "max-results"].iter().map(|v|*v)); + v.extend(["advertiser-ids", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -5538,7 +5538,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "ids", "sort-field", "advertiser-ids", "sort-order", "group-number", "search-string", "max-results"].iter().map(|v|*v)); + v.extend(["advertiser-ids", "group-number", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -6047,7 +6047,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["types", "page-token", "sort-field", "rendering-ids", "ids", "companion-creative-ids", "advertiser-id", "studio-creative-id", "size-ids", "archived", "active", "sort-order", "campaign-id", "search-string", "creative-field-ids", "max-results"].iter().map(|v|*v)); + v.extend(["active", "advertiser-id", "archived", "campaign-id", "companion-creative-ids", "creative-field-ids", "ids", "max-results", "page-token", "rendering-ids", "search-string", "size-ids", "sort-field", "sort-order", "studio-creative-id", "types"].iter().map(|v|*v)); v } )); } } @@ -6466,7 +6466,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -6592,7 +6592,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "ids", "sort-field", "directory-site-ids", "sort-order", "search-string", "max-results"].iter().map(|v|*v)); + v.extend(["directory-site-ids", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -6848,7 +6848,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "ids", "sort-field", "parent-id", "dfp-network-code", "accepts-in-stream-video-placements", "accepts-interstitial-placements", "accepts-publisher-paid-placements", "active", "sort-order", "search-string", "country-id", "max-results"].iter().map(|v|*v)); + v.extend(["accepts-in-stream-video-placements", "accepts-interstitial-placements", "accepts-publisher-paid-placements", "active", "country-id", "dfp-network-code", "ids", "max-results", "page-token", "parent-id", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -7045,7 +7045,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["advertiser-id", "object-type", "names", "object-id"].iter().map(|v|*v)); + v.extend(["advertiser-id", "names", "object-id", "object-type"].iter().map(|v|*v)); v } )); } } @@ -7336,7 +7336,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["advertiser-id", "ids", "sort-field", "ad-id", "enabled", "event-tag-types", "definitions-only", "sort-order", "campaign-id", "search-string"].iter().map(|v|*v)); + v.extend(["ad-id", "advertiser-id", "campaign-id", "definitions-only", "enabled", "event-tag-types", "ids", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -7690,7 +7690,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "sort-field", "scope", "sort-order", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "scope", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -8059,7 +8059,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "ids", "sort-field", "floodlight-activity-group-ids", "tag-string", "floodlight-activity-group-type", "advertiser-id", "floodlight-activity-group-name", "floodlight-configuration-id", "sort-order", "floodlight-activity-group-tag-string", "search-string", "max-results"].iter().map(|v|*v)); + v.extend(["advertiser-id", "floodlight-activity-group-ids", "floodlight-activity-group-name", "floodlight-activity-group-tag-string", "floodlight-activity-group-type", "floodlight-configuration-id", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order", "tag-string"].iter().map(|v|*v)); v } )); } } @@ -8552,7 +8552,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "ids", "sort-field", "advertiser-id", "floodlight-configuration-id", "sort-order", "type", "search-string", "max-results"].iter().map(|v|*v)); + v.extend(["advertiser-id", "floodlight-configuration-id", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order", "type"].iter().map(|v|*v)); v } )); } } @@ -9238,7 +9238,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "ids", "sort-field", "in-plan", "site-id", "sort-order", "order-id", "type", "max-results"].iter().map(|v|*v)); + v.extend(["ids", "in-plan", "max-results", "order-id", "page-token", "site-id", "sort-field", "sort-order", "type"].iter().map(|v|*v)); v } )); } } @@ -10201,7 +10201,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "ids", "sort-field", "approved", "site-id", "sort-order", "order-id", "search-string", "max-results"].iter().map(|v|*v)); + v.extend(["approved", "ids", "max-results", "order-id", "page-token", "search-string", "site-id", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -10327,7 +10327,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "ids", "sort-field", "site-id", "sort-order", "search-string", "max-results"].iter().map(|v|*v)); + v.extend(["ids", "max-results", "page-token", "search-string", "site-id", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -10636,7 +10636,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "placement-strategy-ids", "max-start-date", "min-start-date", "ids", "max-end-date", "archived", "campaign-ids", "pricing-types", "min-end-date", "content-category-ids", "sort-order", "placement-group-type", "site-ids", "sort-field", "advertiser-ids", "directory-site-ids", "search-string", "max-results"].iter().map(|v|*v)); + v.extend(["advertiser-ids", "archived", "campaign-ids", "content-category-ids", "directory-site-ids", "ids", "max-end-date", "max-results", "max-start-date", "min-end-date", "min-start-date", "page-token", "placement-group-type", "placement-strategy-ids", "pricing-types", "search-string", "site-ids", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -11185,7 +11185,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "ids", "sort-field", "sort-order", "search-string", "max-results"].iter().map(|v|*v)); + v.extend(["ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -11423,7 +11423,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["tag-formats", "placement-ids", "campaign-id"].iter().map(|v|*v)); + v.extend(["campaign-id", "placement-ids", "tag-formats"].iter().map(|v|*v)); v } )); } } @@ -11774,7 +11774,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "payment-source", "placement-strategy-ids", "max-start-date", "min-start-date", "ids", "max-end-date", "size-ids", "compatibilities", "archived", "group-ids", "campaign-ids", "pricing-types", "min-end-date", "content-category-ids", "sort-order", "site-ids", "sort-field", "advertiser-ids", "directory-site-ids", "search-string", "max-results"].iter().map(|v|*v)); + v.extend(["advertiser-ids", "archived", "campaign-ids", "compatibilities", "content-category-ids", "directory-site-ids", "group-ids", "ids", "max-end-date", "max-results", "max-start-date", "min-end-date", "min-start-date", "page-token", "payment-source", "placement-strategy-ids", "pricing-types", "search-string", "site-ids", "size-ids", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -12468,7 +12468,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "ids", "sort-field", "advertiser-ids", "sort-order", "search-string", "max-results"].iter().map(|v|*v)); + v.extend(["advertiser-ids", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -12977,7 +12977,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "sort-field", "floodlight-activity-id", "active", "sort-order", "name", "max-results"].iter().map(|v|*v)); + v.extend(["active", "floodlight-activity-id", "max-results", "name", "page-token", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -13519,7 +13519,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "sort-field", "sort-order", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -13804,7 +13804,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "sort-field", "scope", "sort-order", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "scope", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -14457,7 +14457,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "ids", "sort-field", "ad-words-site", "directory-site-ids", "approved", "subaccount-id", "accepts-in-stream-video-placements", "accepts-interstitial-placements", "accepts-publisher-paid-placements", "sort-order", "search-string", "campaign-ids", "unmapped-site", "max-results"].iter().map(|v|*v)); + v.extend(["accepts-in-stream-video-placements", "accepts-interstitial-placements", "accepts-publisher-paid-placements", "ad-words-site", "approved", "campaign-ids", "directory-site-ids", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order", "subaccount-id", "unmapped-site"].iter().map(|v|*v)); v } )); } } @@ -14897,7 +14897,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["ids", "iab-standard", "height", "width"].iter().map(|v|*v)); + v.extend(["height", "iab-standard", "ids", "width"].iter().map(|v|*v)); v } )); } } @@ -15109,7 +15109,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "ids", "sort-field", "sort-order", "search-string", "max-results"].iter().map(|v|*v)); + v.extend(["ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -15410,7 +15410,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "sort-field", "active", "sort-order", "name", "max-results"].iter().map(|v|*v)); + v.extend(["active", "max-results", "name", "page-token", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -15638,7 +15638,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "ids", "sort-field", "advertiser-id", "sort-order", "search-string", "max-results"].iter().map(|v|*v)); + v.extend(["advertiser-id", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -16422,7 +16422,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "ids", "sort-field", "subaccount-id", "account-user-role-only", "sort-order", "search-string", "max-results"].iter().map(|v|*v)); + v.extend(["account-user-role-only", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order", "subaccount-id"].iter().map(|v|*v)); v } )); } } diff --git a/gen/dfareporting2d8/src/api.rs b/gen/dfareporting2d8/src/api.rs index bce46fcf88..4fbb6609d9 100644 --- a/gen/dfareporting2d8/src/api.rs +++ b/gen/dfareporting2d8/src/api.rs @@ -14276,25 +14276,15 @@ impl<'a, C> AccountActiveAdSummaryGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14302,13 +14292,15 @@ impl<'a, C> AccountActiveAdSummaryGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14547,25 +14539,15 @@ impl<'a, C> AccountPermissionGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14573,13 +14555,15 @@ impl<'a, C> AccountPermissionGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14816,25 +14800,15 @@ impl<'a, C> AccountPermissionGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14842,13 +14816,15 @@ impl<'a, C> AccountPermissionGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15077,25 +15053,15 @@ impl<'a, C> AccountPermissionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15103,13 +15069,15 @@ impl<'a, C> AccountPermissionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15346,25 +15314,15 @@ impl<'a, C> AccountPermissionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15372,13 +15330,15 @@ impl<'a, C> AccountPermissionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15607,25 +15567,15 @@ impl<'a, C> AccountUserProfileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15633,13 +15583,15 @@ impl<'a, C> AccountUserProfileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15897,25 +15849,15 @@ impl<'a, C> AccountUserProfileInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15923,13 +15865,15 @@ impl<'a, C> AccountUserProfileInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16212,25 +16156,15 @@ impl<'a, C> AccountUserProfileListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16238,13 +16172,15 @@ impl<'a, C> AccountUserProfileListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16558,25 +16494,15 @@ impl<'a, C> AccountUserProfilePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16584,13 +16510,15 @@ impl<'a, C> AccountUserProfilePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16857,25 +16785,15 @@ impl<'a, C> AccountUserProfileUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16883,13 +16801,15 @@ impl<'a, C> AccountUserProfileUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17127,25 +17047,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17153,13 +17063,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17433,25 +17345,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17459,13 +17361,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17765,25 +17669,15 @@ impl<'a, C> AccountPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17791,13 +17685,15 @@ impl<'a, C> AccountPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18064,25 +17960,15 @@ impl<'a, C> AccountUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18090,13 +17976,15 @@ impl<'a, C> AccountUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18334,25 +18222,15 @@ impl<'a, C> AdGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18360,13 +18238,15 @@ impl<'a, C> AdGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18624,25 +18504,15 @@ impl<'a, C> AdInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18650,13 +18520,15 @@ impl<'a, C> AdInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19027,25 +18899,15 @@ impl<'a, C> AdListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19053,13 +18915,15 @@ impl<'a, C> AdListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19480,25 +19344,15 @@ impl<'a, C> AdPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19506,13 +19360,15 @@ impl<'a, C> AdPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19779,25 +19635,15 @@ impl<'a, C> AdUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19805,13 +19651,15 @@ impl<'a, C> AdUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20048,25 +19896,15 @@ impl<'a, C> AdvertiserGroupDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20074,11 +19912,11 @@ impl<'a, C> AdvertiserGroupDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -20311,25 +20149,15 @@ impl<'a, C> AdvertiserGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20337,13 +20165,15 @@ impl<'a, C> AdvertiserGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20601,25 +20431,15 @@ impl<'a, C> AdvertiserGroupInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20627,13 +20447,15 @@ impl<'a, C> AdvertiserGroupInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20901,25 +20723,15 @@ impl<'a, C> AdvertiserGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20927,13 +20739,15 @@ impl<'a, C> AdvertiserGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21226,25 +21040,15 @@ impl<'a, C> AdvertiserGroupPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21252,13 +21056,15 @@ impl<'a, C> AdvertiserGroupPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21525,25 +21331,15 @@ impl<'a, C> AdvertiserGroupUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21551,13 +21347,15 @@ impl<'a, C> AdvertiserGroupUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21795,25 +21593,15 @@ impl<'a, C> AdvertiserGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21821,13 +21609,15 @@ impl<'a, C> AdvertiserGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22085,25 +21875,15 @@ impl<'a, C> AdvertiserInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22111,13 +21891,15 @@ impl<'a, C> AdvertiserInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22419,25 +22201,15 @@ impl<'a, C> AdvertiserListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22445,13 +22217,15 @@ impl<'a, C> AdvertiserListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22788,25 +22562,15 @@ impl<'a, C> AdvertiserPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22814,13 +22578,15 @@ impl<'a, C> AdvertiserPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23087,25 +22853,15 @@ impl<'a, C> AdvertiserUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23113,13 +22869,15 @@ impl<'a, C> AdvertiserUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23355,25 +23113,15 @@ impl<'a, C> BrowserListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23381,13 +23129,15 @@ impl<'a, C> BrowserListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23637,25 +23387,15 @@ impl<'a, C> CampaignCreativeAssociationInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23663,13 +23403,15 @@ impl<'a, C> CampaignCreativeAssociationInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23932,25 +23674,15 @@ impl<'a, C> CampaignCreativeAssociationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23958,13 +23690,15 @@ impl<'a, C> CampaignCreativeAssociationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24224,25 +23958,15 @@ impl<'a, C> CampaignGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24250,13 +23974,15 @@ impl<'a, C> CampaignGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24518,25 +24244,15 @@ impl<'a, C> CampaignInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24544,13 +24260,15 @@ impl<'a, C> CampaignInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24879,25 +24597,15 @@ impl<'a, C> CampaignListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24905,13 +24613,15 @@ impl<'a, C> CampaignListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25256,25 +24966,15 @@ impl<'a, C> CampaignPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25282,13 +24982,15 @@ impl<'a, C> CampaignPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25555,25 +25257,15 @@ impl<'a, C> CampaignUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25581,13 +25273,15 @@ impl<'a, C> CampaignUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25825,25 +25519,15 @@ impl<'a, C> ChangeLogGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25851,13 +25535,15 @@ impl<'a, C> ChangeLogGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26150,25 +25836,15 @@ impl<'a, C> ChangeLogListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26176,13 +25852,15 @@ impl<'a, C> ChangeLogListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26508,25 +26186,15 @@ impl<'a, C> CityListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26534,13 +26202,15 @@ impl<'a, C> CityListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26800,25 +26470,15 @@ impl<'a, C> ConnectionTypeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26826,13 +26486,15 @@ impl<'a, C> ConnectionTypeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27069,25 +26731,15 @@ impl<'a, C> ConnectionTypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27095,13 +26747,15 @@ impl<'a, C> ConnectionTypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27329,25 +26983,15 @@ impl<'a, C> ContentCategoryDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27355,11 +26999,11 @@ impl<'a, C> ContentCategoryDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -27592,25 +27236,15 @@ impl<'a, C> ContentCategoryGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27618,13 +27252,15 @@ impl<'a, C> ContentCategoryGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27882,25 +27518,15 @@ impl<'a, C> ContentCategoryInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27908,13 +27534,15 @@ impl<'a, C> ContentCategoryInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28182,25 +27810,15 @@ impl<'a, C> ContentCategoryListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28208,13 +27826,15 @@ impl<'a, C> ContentCategoryListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28507,25 +28127,15 @@ impl<'a, C> ContentCategoryPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28533,13 +28143,15 @@ impl<'a, C> ContentCategoryPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28806,25 +28418,15 @@ impl<'a, C> ContentCategoryUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28832,13 +28434,15 @@ impl<'a, C> ContentCategoryUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29095,25 +28699,15 @@ impl<'a, C> ConversionBatchinsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29121,13 +28715,15 @@ impl<'a, C> ConversionBatchinsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29384,25 +28980,15 @@ impl<'a, C> ConversionBatchupdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29410,13 +28996,15 @@ impl<'a, C> ConversionBatchupdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29654,25 +29242,15 @@ impl<'a, C> CountryGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29680,13 +29258,15 @@ impl<'a, C> CountryGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29923,25 +29503,15 @@ impl<'a, C> CountryListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29949,13 +29519,15 @@ impl<'a, C> CountryListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30250,25 +29822,15 @@ impl<'a, C> CreativeAssetInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30276,7 +29838,7 @@ impl<'a, C> CreativeAssetInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -30288,7 +29850,7 @@ impl<'a, C> CreativeAssetInsertCall<'a, C> where C: BorrowMut CreativeAssetInsertCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30602,25 +30166,15 @@ impl<'a, C> CreativeFieldValueDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30628,11 +30182,11 @@ impl<'a, C> CreativeFieldValueDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -30877,25 +30431,15 @@ impl<'a, C> CreativeFieldValueGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30903,13 +30447,15 @@ impl<'a, C> CreativeFieldValueGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31179,25 +30725,15 @@ impl<'a, C> CreativeFieldValueInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31205,13 +30741,15 @@ impl<'a, C> CreativeFieldValueInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31491,25 +31029,15 @@ impl<'a, C> CreativeFieldValueListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31517,13 +31045,15 @@ impl<'a, C> CreativeFieldValueListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31828,25 +31358,15 @@ impl<'a, C> CreativeFieldValuePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31854,13 +31374,15 @@ impl<'a, C> CreativeFieldValuePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32139,25 +31661,15 @@ impl<'a, C> CreativeFieldValueUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32165,13 +31677,15 @@ impl<'a, C> CreativeFieldValueUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32418,25 +31932,15 @@ impl<'a, C> CreativeFieldDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32444,11 +31948,11 @@ impl<'a, C> CreativeFieldDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -32681,25 +32185,15 @@ impl<'a, C> CreativeFieldGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32707,13 +32201,15 @@ impl<'a, C> CreativeFieldGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32971,25 +32467,15 @@ impl<'a, C> CreativeFieldInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32997,13 +32483,15 @@ impl<'a, C> CreativeFieldInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33278,25 +32766,15 @@ impl<'a, C> CreativeFieldListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33304,13 +32782,15 @@ impl<'a, C> CreativeFieldListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33611,25 +33091,15 @@ impl<'a, C> CreativeFieldPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33637,13 +33107,15 @@ impl<'a, C> CreativeFieldPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33910,25 +33382,15 @@ impl<'a, C> CreativeFieldUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33936,13 +33398,15 @@ impl<'a, C> CreativeFieldUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34180,25 +33644,15 @@ impl<'a, C> CreativeGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34206,13 +33660,15 @@ impl<'a, C> CreativeGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34470,25 +33926,15 @@ impl<'a, C> CreativeGroupInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34496,13 +33942,15 @@ impl<'a, C> CreativeGroupInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34782,25 +34230,15 @@ impl<'a, C> CreativeGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34808,13 +34246,15 @@ impl<'a, C> CreativeGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35122,25 +34562,15 @@ impl<'a, C> CreativeGroupPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35148,13 +34578,15 @@ impl<'a, C> CreativeGroupPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35421,25 +34853,15 @@ impl<'a, C> CreativeGroupUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35447,13 +34869,15 @@ impl<'a, C> CreativeGroupUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35691,25 +35115,15 @@ impl<'a, C> CreativeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35717,13 +35131,15 @@ impl<'a, C> CreativeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35981,25 +35397,15 @@ impl<'a, C> CreativeInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36007,13 +35413,15 @@ impl<'a, C> CreativeInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36341,25 +35749,15 @@ impl<'a, C> CreativeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36367,13 +35765,15 @@ impl<'a, C> CreativeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36741,25 +36141,15 @@ impl<'a, C> CreativePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36767,13 +36157,15 @@ impl<'a, C> CreativePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37040,25 +36432,15 @@ impl<'a, C> CreativeUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37066,13 +36448,15 @@ impl<'a, C> CreativeUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37339,25 +36723,15 @@ impl<'a, C> DimensionValueQueryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37365,13 +36739,15 @@ impl<'a, C> DimensionValueQueryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37623,25 +36999,15 @@ impl<'a, C> DirectorySiteContactGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37649,13 +37015,15 @@ impl<'a, C> DirectorySiteContactGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37931,25 +37299,15 @@ impl<'a, C> DirectorySiteContactListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37957,13 +37315,15 @@ impl<'a, C> DirectorySiteContactListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38243,25 +37603,15 @@ impl<'a, C> DirectorySiteGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38269,13 +37619,15 @@ impl<'a, C> DirectorySiteGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38533,25 +37885,15 @@ impl<'a, C> DirectorySiteInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38559,13 +37901,15 @@ impl<'a, C> DirectorySiteInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38868,25 +38212,15 @@ impl<'a, C> DirectorySiteListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38894,13 +38228,15 @@ impl<'a, C> DirectorySiteListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39224,25 +38560,15 @@ impl<'a, C> DynamicTargetingKeyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39250,11 +38576,11 @@ impl<'a, C> DynamicTargetingKeyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -39526,25 +38852,15 @@ impl<'a, C> DynamicTargetingKeyInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39552,13 +38868,15 @@ impl<'a, C> DynamicTargetingKeyInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39816,25 +39134,15 @@ impl<'a, C> DynamicTargetingKeyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39842,13 +39150,15 @@ impl<'a, C> DynamicTargetingKeyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40105,25 +39415,15 @@ impl<'a, C> EventTagDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40131,11 +39431,11 @@ impl<'a, C> EventTagDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -40368,25 +39668,15 @@ impl<'a, C> EventTagGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40394,13 +39684,15 @@ impl<'a, C> EventTagGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40658,25 +39950,15 @@ impl<'a, C> EventTagInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40684,13 +39966,15 @@ impl<'a, C> EventTagInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40980,25 +40264,15 @@ impl<'a, C> EventTagListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41006,13 +40280,15 @@ impl<'a, C> EventTagListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41334,25 +40610,15 @@ impl<'a, C> EventTagPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41360,13 +40626,15 @@ impl<'a, C> EventTagPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41633,25 +40901,15 @@ impl<'a, C> EventTagUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41659,13 +40917,15 @@ impl<'a, C> EventTagUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41924,25 +41184,15 @@ impl<'a, C> FileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41950,19 +41200,21 @@ impl<'a, C> FileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = if enable_resource_parsing { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); } } - } else { (reconstructed_result, Default::default()) }; + } else { (res, Default::default()) }; dlg.finished(true); return Ok(result_value) @@ -42218,25 +41470,15 @@ impl<'a, C> FileListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42244,13 +41486,15 @@ impl<'a, C> FileListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42513,25 +41757,15 @@ impl<'a, C> FloodlightActivityDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42539,11 +41773,11 @@ impl<'a, C> FloodlightActivityDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -42779,25 +42013,15 @@ impl<'a, C> FloodlightActivityGeneratetagCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42805,13 +42029,15 @@ impl<'a, C> FloodlightActivityGeneratetagCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43047,25 +42273,15 @@ impl<'a, C> FloodlightActivityGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43073,13 +42289,15 @@ impl<'a, C> FloodlightActivityGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43337,25 +42555,15 @@ impl<'a, C> FloodlightActivityInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43363,13 +42571,15 @@ impl<'a, C> FloodlightActivityInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43674,25 +42884,15 @@ impl<'a, C> FloodlightActivityListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43700,13 +42900,15 @@ impl<'a, C> FloodlightActivityListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44049,25 +43251,15 @@ impl<'a, C> FloodlightActivityPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44075,13 +43267,15 @@ impl<'a, C> FloodlightActivityPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44348,25 +43542,15 @@ impl<'a, C> FloodlightActivityUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44374,13 +43558,15 @@ impl<'a, C> FloodlightActivityUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44618,25 +43804,15 @@ impl<'a, C> FloodlightActivityGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44644,13 +43820,15 @@ impl<'a, C> FloodlightActivityGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44908,25 +44086,15 @@ impl<'a, C> FloodlightActivityGroupInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44934,13 +44102,15 @@ impl<'a, C> FloodlightActivityGroupInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45223,25 +44393,15 @@ impl<'a, C> FloodlightActivityGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45249,13 +44409,15 @@ impl<'a, C> FloodlightActivityGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45569,25 +44731,15 @@ impl<'a, C> FloodlightActivityGroupPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45595,13 +44747,15 @@ impl<'a, C> FloodlightActivityGroupPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45868,25 +45022,15 @@ impl<'a, C> FloodlightActivityGroupUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45894,13 +45038,15 @@ impl<'a, C> FloodlightActivityGroupUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46138,25 +45284,15 @@ impl<'a, C> FloodlightConfigurationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46164,13 +45300,15 @@ impl<'a, C> FloodlightConfigurationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46414,25 +45552,15 @@ impl<'a, C> FloodlightConfigurationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46440,13 +45568,15 @@ impl<'a, C> FloodlightConfigurationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46704,25 +45834,15 @@ impl<'a, C> FloodlightConfigurationPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46730,13 +45850,15 @@ impl<'a, C> FloodlightConfigurationPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47003,25 +46125,15 @@ impl<'a, C> FloodlightConfigurationUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47029,13 +46141,15 @@ impl<'a, C> FloodlightConfigurationUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47275,25 +46389,15 @@ impl<'a, C> InventoryItemGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47301,13 +46405,15 @@ impl<'a, C> InventoryItemGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47607,25 +46713,15 @@ impl<'a, C> InventoryItemListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47633,13 +46729,15 @@ impl<'a, C> InventoryItemListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47945,25 +47043,15 @@ impl<'a, C> LandingPageDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47971,11 +47059,11 @@ impl<'a, C> LandingPageDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -48220,25 +47308,15 @@ impl<'a, C> LandingPageGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -48246,13 +47324,15 @@ impl<'a, C> LandingPageGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -48522,25 +47602,15 @@ impl<'a, C> LandingPageInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -48548,13 +47618,15 @@ impl<'a, C> LandingPageInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -48802,25 +47874,15 @@ impl<'a, C> LandingPageListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -48828,13 +47890,15 @@ impl<'a, C> LandingPageListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49096,25 +48160,15 @@ impl<'a, C> LandingPagePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -49122,13 +48176,15 @@ impl<'a, C> LandingPagePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49407,25 +48463,15 @@ impl<'a, C> LandingPageUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -49433,13 +48479,15 @@ impl<'a, C> LandingPageUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49685,25 +48733,15 @@ impl<'a, C> LanguageListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -49711,13 +48749,15 @@ impl<'a, C> LanguageListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49944,25 +48984,15 @@ impl<'a, C> MetroListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -49970,13 +49000,15 @@ impl<'a, C> MetroListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -50205,25 +49237,15 @@ impl<'a, C> MobileCarrierGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -50231,13 +49253,15 @@ impl<'a, C> MobileCarrierGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -50474,25 +49498,15 @@ impl<'a, C> MobileCarrierListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -50500,13 +49514,15 @@ impl<'a, C> MobileCarrierListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -50735,25 +49751,15 @@ impl<'a, C> OperatingSystemVersionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -50761,13 +49767,15 @@ impl<'a, C> OperatingSystemVersionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51004,25 +50012,15 @@ impl<'a, C> OperatingSystemVersionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51030,13 +50028,15 @@ impl<'a, C> OperatingSystemVersionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51265,25 +50265,15 @@ impl<'a, C> OperatingSystemGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51291,13 +50281,15 @@ impl<'a, C> OperatingSystemGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51534,25 +50526,15 @@ impl<'a, C> OperatingSystemListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51560,13 +50542,15 @@ impl<'a, C> OperatingSystemListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51797,25 +50781,15 @@ impl<'a, C> OrderDocumentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51823,13 +50797,15 @@ impl<'a, C> OrderDocumentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -52129,25 +51105,15 @@ impl<'a, C> OrderDocumentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -52155,13 +51121,15 @@ impl<'a, C> OrderDocumentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -52468,25 +51436,15 @@ impl<'a, C> OrderGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -52494,13 +51452,15 @@ impl<'a, C> OrderGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -52788,25 +51748,15 @@ impl<'a, C> OrderListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -52814,13 +51764,15 @@ impl<'a, C> OrderListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -53110,25 +52062,15 @@ impl<'a, C> PlacementGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -53136,13 +52078,15 @@ impl<'a, C> PlacementGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -53400,25 +52344,15 @@ impl<'a, C> PlacementGroupInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -53426,13 +52360,15 @@ impl<'a, C> PlacementGroupInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -53779,25 +52715,15 @@ impl<'a, C> PlacementGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -53805,13 +52731,15 @@ impl<'a, C> PlacementGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -54202,25 +53130,15 @@ impl<'a, C> PlacementGroupPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -54228,13 +53146,15 @@ impl<'a, C> PlacementGroupPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -54501,25 +53421,15 @@ impl<'a, C> PlacementGroupUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -54527,13 +53437,15 @@ impl<'a, C> PlacementGroupUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -54770,25 +53682,15 @@ impl<'a, C> PlacementStrategyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -54796,11 +53698,11 @@ impl<'a, C> PlacementStrategyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -55033,25 +53935,15 @@ impl<'a, C> PlacementStrategyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -55059,13 +53951,15 @@ impl<'a, C> PlacementStrategyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -55323,25 +54217,15 @@ impl<'a, C> PlacementStrategyInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -55349,13 +54233,15 @@ impl<'a, C> PlacementStrategyInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -55623,25 +54509,15 @@ impl<'a, C> PlacementStrategyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -55649,13 +54525,15 @@ impl<'a, C> PlacementStrategyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -55948,25 +54826,15 @@ impl<'a, C> PlacementStrategyPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -55974,13 +54842,15 @@ impl<'a, C> PlacementStrategyPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -56247,25 +55117,15 @@ impl<'a, C> PlacementStrategyUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -56273,13 +55133,15 @@ impl<'a, C> PlacementStrategyUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -56534,25 +55396,15 @@ impl<'a, C> PlacementGeneratetagCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -56560,13 +55412,15 @@ impl<'a, C> PlacementGeneratetagCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -56820,25 +55674,15 @@ impl<'a, C> PlacementGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -56846,13 +55690,15 @@ impl<'a, C> PlacementGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -57110,25 +55956,15 @@ impl<'a, C> PlacementInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -57136,13 +55972,15 @@ impl<'a, C> PlacementInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -57510,25 +56348,15 @@ impl<'a, C> PlacementListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -57536,13 +56364,15 @@ impl<'a, C> PlacementListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -57957,25 +56787,15 @@ impl<'a, C> PlacementPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -57983,13 +56803,15 @@ impl<'a, C> PlacementPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -58256,25 +57078,15 @@ impl<'a, C> PlacementUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -58282,13 +57094,15 @@ impl<'a, C> PlacementUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -58526,25 +57340,15 @@ impl<'a, C> PlatformTypeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -58552,13 +57356,15 @@ impl<'a, C> PlatformTypeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -58795,25 +57601,15 @@ impl<'a, C> PlatformTypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -58821,13 +57617,15 @@ impl<'a, C> PlatformTypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -59056,25 +57854,15 @@ impl<'a, C> PostalCodeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -59082,13 +57870,15 @@ impl<'a, C> PostalCodeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -59325,25 +58115,15 @@ impl<'a, C> PostalCodeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -59351,13 +58131,15 @@ impl<'a, C> PostalCodeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -59586,25 +58368,15 @@ impl<'a, C> ProjectGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -59612,13 +58384,15 @@ impl<'a, C> ProjectGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -59894,25 +58668,15 @@ impl<'a, C> ProjectListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -59920,13 +58684,15 @@ impl<'a, C> ProjectListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -60204,25 +58970,15 @@ impl<'a, C> RegionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -60230,13 +58986,15 @@ impl<'a, C> RegionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -60465,25 +59223,15 @@ impl<'a, C> RemarketingListShareGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -60491,13 +59239,15 @@ impl<'a, C> RemarketingListShareGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -60757,25 +59507,15 @@ impl<'a, C> RemarketingListSharePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -60783,13 +59523,15 @@ impl<'a, C> RemarketingListSharePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -61056,25 +59798,15 @@ impl<'a, C> RemarketingListShareUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -61082,13 +59814,15 @@ impl<'a, C> RemarketingListShareUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -61326,25 +60060,15 @@ impl<'a, C> RemarketingListGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -61352,13 +60076,15 @@ impl<'a, C> RemarketingListGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -61616,25 +60342,15 @@ impl<'a, C> RemarketingListInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -61642,13 +60358,15 @@ impl<'a, C> RemarketingListInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -61921,25 +60639,15 @@ impl<'a, C> RemarketingListListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -61947,13 +60655,15 @@ impl<'a, C> RemarketingListListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -62262,25 +60972,15 @@ impl<'a, C> RemarketingListPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -62288,13 +60988,15 @@ impl<'a, C> RemarketingListPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -62561,25 +61263,15 @@ impl<'a, C> RemarketingListUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -62587,13 +61279,15 @@ impl<'a, C> RemarketingListUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -62850,25 +61544,15 @@ impl<'a, C> ReportCompatibleFieldQueryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -62876,13 +61560,15 @@ impl<'a, C> ReportCompatibleFieldQueryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -63143,25 +61829,15 @@ impl<'a, C> ReportFileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -63169,19 +61845,21 @@ impl<'a, C> ReportFileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = if enable_resource_parsing { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); } } - } else { (reconstructed_result, Default::default()) }; + } else { (res, Default::default()) }; dlg.finished(true); return Ok(result_value) @@ -63444,25 +62122,15 @@ impl<'a, C> ReportFileListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -63470,13 +62138,15 @@ impl<'a, C> ReportFileListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -63742,25 +62412,15 @@ impl<'a, C> ReportDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -63768,11 +62428,11 @@ impl<'a, C> ReportDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -64005,25 +62665,15 @@ impl<'a, C> ReportGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -64031,13 +62681,15 @@ impl<'a, C> ReportGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -64295,25 +62947,15 @@ impl<'a, C> ReportInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -64321,13 +62963,15 @@ impl<'a, C> ReportInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -64588,25 +63232,15 @@ impl<'a, C> ReportListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -64614,13 +63248,15 @@ impl<'a, C> ReportListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -64905,25 +63541,15 @@ impl<'a, C> ReportPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -64931,13 +63557,15 @@ impl<'a, C> ReportPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -65190,25 +63818,15 @@ impl<'a, C> ReportRunCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -65216,13 +63834,15 @@ impl<'a, C> ReportRunCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -65489,25 +64109,15 @@ impl<'a, C> ReportUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -65515,13 +64125,15 @@ impl<'a, C> ReportUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -65769,25 +64381,15 @@ impl<'a, C> SiteGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -65795,13 +64397,15 @@ impl<'a, C> SiteGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -66059,25 +64663,15 @@ impl<'a, C> SiteInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -66085,13 +64679,15 @@ impl<'a, C> SiteInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -66408,25 +65004,15 @@ impl<'a, C> SiteListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -66434,13 +65020,15 @@ impl<'a, C> SiteListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -66798,25 +65386,15 @@ impl<'a, C> SitePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -66824,13 +65402,15 @@ impl<'a, C> SitePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -67097,25 +65677,15 @@ impl<'a, C> SiteUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -67123,13 +65693,15 @@ impl<'a, C> SiteUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -67367,25 +65939,15 @@ impl<'a, C> SizeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -67393,13 +65955,15 @@ impl<'a, C> SizeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -67657,25 +66221,15 @@ impl<'a, C> SizeInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -67683,13 +66237,15 @@ impl<'a, C> SizeInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -67947,25 +66503,15 @@ impl<'a, C> SizeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -67973,13 +66519,15 @@ impl<'a, C> SizeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -68237,25 +66785,15 @@ impl<'a, C> SubaccountGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -68263,13 +66801,15 @@ impl<'a, C> SubaccountGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -68527,25 +67067,15 @@ impl<'a, C> SubaccountInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -68553,13 +67083,15 @@ impl<'a, C> SubaccountInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -68827,25 +67359,15 @@ impl<'a, C> SubaccountListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -68853,13 +67375,15 @@ impl<'a, C> SubaccountListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -69152,25 +67676,15 @@ impl<'a, C> SubaccountPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -69178,13 +67692,15 @@ impl<'a, C> SubaccountPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -69451,25 +67967,15 @@ impl<'a, C> SubaccountUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -69477,13 +67983,15 @@ impl<'a, C> SubaccountUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -69721,25 +68229,15 @@ impl<'a, C> TargetableRemarketingListGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -69747,13 +68245,15 @@ impl<'a, C> TargetableRemarketingListGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -70022,25 +68522,15 @@ impl<'a, C> TargetableRemarketingListListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -70048,13 +68538,15 @@ impl<'a, C> TargetableRemarketingListListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -70335,25 +68827,15 @@ impl<'a, C> TargetingTemplateGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -70361,13 +68843,15 @@ impl<'a, C> TargetingTemplateGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -70625,25 +69109,15 @@ impl<'a, C> TargetingTemplateInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -70651,13 +69125,15 @@ impl<'a, C> TargetingTemplateInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -70930,25 +69406,15 @@ impl<'a, C> TargetingTemplateListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -70956,13 +69422,15 @@ impl<'a, C> TargetingTemplateListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -71262,25 +69730,15 @@ impl<'a, C> TargetingTemplatePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -71288,13 +69746,15 @@ impl<'a, C> TargetingTemplatePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -71561,25 +70021,15 @@ impl<'a, C> TargetingTemplateUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -71587,13 +70037,15 @@ impl<'a, C> TargetingTemplateUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -71829,25 +70281,15 @@ impl<'a, C> UserProfileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -71855,13 +70297,15 @@ impl<'a, C> UserProfileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -72065,25 +70509,15 @@ impl<'a, C> UserProfileListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -72091,13 +70525,15 @@ impl<'a, C> UserProfileListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -72316,25 +70752,15 @@ impl<'a, C> UserRolePermissionGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -72342,13 +70768,15 @@ impl<'a, C> UserRolePermissionGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -72585,25 +71013,15 @@ impl<'a, C> UserRolePermissionGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -72611,13 +71029,15 @@ impl<'a, C> UserRolePermissionGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -72846,25 +71266,15 @@ impl<'a, C> UserRolePermissionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -72872,13 +71282,15 @@ impl<'a, C> UserRolePermissionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -73122,25 +71534,15 @@ impl<'a, C> UserRolePermissionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -73148,13 +71550,15 @@ impl<'a, C> UserRolePermissionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -73390,25 +71794,15 @@ impl<'a, C> UserRoleDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -73416,11 +71810,11 @@ impl<'a, C> UserRoleDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -73653,25 +72047,15 @@ impl<'a, C> UserRoleGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -73679,13 +72063,15 @@ impl<'a, C> UserRoleGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -73943,25 +72329,15 @@ impl<'a, C> UserRoleInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -73969,13 +72345,15 @@ impl<'a, C> UserRoleInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -74253,25 +72631,15 @@ impl<'a, C> UserRoleListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -74279,13 +72647,15 @@ impl<'a, C> UserRoleListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -74592,25 +72962,15 @@ impl<'a, C> UserRolePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -74618,13 +72978,15 @@ impl<'a, C> UserRolePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -74891,25 +73253,15 @@ impl<'a, C> UserRoleUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -74917,13 +73269,15 @@ impl<'a, C> UserRoleUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -75161,25 +73515,15 @@ impl<'a, C> VideoFormatGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -75187,13 +73531,15 @@ impl<'a, C> VideoFormatGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -75430,25 +73776,15 @@ impl<'a, C> VideoFormatListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -75456,13 +73792,15 @@ impl<'a, C> VideoFormatListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/dfareporting2d8/src/client.rs b/gen/dfareporting2d8/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/dfareporting2d8/src/client.rs +++ b/gen/dfareporting2d8/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/dfareporting3-cli/src/main.rs b/gen/dfareporting3-cli/src/main.rs index e2542885ce..590b3a36bc 100644 --- a/gen/dfareporting3-cli/src/main.rs +++ b/gen/dfareporting3-cli/src/main.rs @@ -508,7 +508,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["ids", "subaccount-id", "max-results", "active", "page-token", "sort-order", "search-string", "sort-field", "user-role-id"].iter().map(|v|*v)); + v.extend(["active", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order", "subaccount-id", "user-role-id"].iter().map(|v|*v)); v } )); } } @@ -850,7 +850,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["ids", "max-results", "active", "page-token", "sort-order", "search-string", "sort-field"].iter().map(|v|*v)); + v.extend(["active", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -1386,7 +1386,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "page-token", "archived", "remarketing-list-ids", "type", "audience-segment-ids", "creative-ids", "search-string", "ssl-compliant", "ids", "ssl-required", "active", "campaign-ids", "landing-page-ids", "dynamic-click-tracker", "overridden-event-tag-id", "creative-optimization-configuration-ids", "advertiser-id", "size-ids", "compatibility", "placement-ids", "sort-order", "sort-field"].iter().map(|v|*v)); + v.extend(["active", "advertiser-id", "archived", "audience-segment-ids", "campaign-ids", "compatibility", "creative-ids", "creative-optimization-configuration-ids", "dynamic-click-tracker", "ids", "landing-page-ids", "max-results", "overridden-event-tag-id", "page-token", "placement-ids", "remarketing-list-ids", "search-string", "size-ids", "sort-field", "sort-order", "ssl-compliant", "ssl-required", "type"].iter().map(|v|*v)); v } )); } } @@ -1941,7 +1941,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["ids", "max-results", "page-token", "sort-order", "search-string", "sort-field"].iter().map(|v|*v)); + v.extend(["ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -2339,7 +2339,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["archived", "ids", "subaccount-id", "max-results", "page-token", "sort-order", "search-string", "advertiser-ids", "sort-field"].iter().map(|v|*v)); + v.extend(["advertiser-ids", "archived", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order", "subaccount-id"].iter().map(|v|*v)); v } )); } } @@ -2769,7 +2769,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["ids", "subaccount-id", "floodlight-configuration-ids", "max-results", "page-token", "advertiser-group-ids", "status", "only-parent", "sort-order", "search-string", "include-advertisers-without-groups-only", "sort-field"].iter().map(|v|*v)); + v.extend(["advertiser-group-ids", "floodlight-configuration-ids", "ids", "include-advertisers-without-groups-only", "max-results", "only-parent", "page-token", "search-string", "sort-field", "sort-order", "status", "subaccount-id"].iter().map(|v|*v)); v } )); } } @@ -3459,7 +3459,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["archived", "overridden-event-tag-id", "subaccount-id", "ids", "at-least-one-optimization-activity", "max-results", "page-token", "advertiser-group-ids", "sort-order", "search-string", "advertiser-ids", "sort-field", "excluded-ids"].iter().map(|v|*v)); + v.extend(["advertiser-group-ids", "advertiser-ids", "archived", "at-least-one-optimization-activity", "excluded-ids", "ids", "max-results", "overridden-event-tag-id", "page-token", "search-string", "sort-field", "sort-order", "subaccount-id"].iter().map(|v|*v)); v } )); } } @@ -3850,7 +3850,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["ids", "user-profile-ids", "max-results", "object-ids", "page-token", "action", "min-change-time", "max-change-time", "object-type", "search-string"].iter().map(|v|*v)); + v.extend(["action", "ids", "max-change-time", "max-results", "min-change-time", "object-ids", "object-type", "page-token", "search-string", "user-profile-ids"].iter().map(|v|*v)); v } )); } } @@ -3915,7 +3915,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["region-dart-ids", "country-dart-ids", "dart-ids", "name-prefix"].iter().map(|v|*v)); + v.extend(["country-dart-ids", "dart-ids", "name-prefix", "region-dart-ids"].iter().map(|v|*v)); v } )); } } @@ -4274,7 +4274,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["ids", "max-results", "page-token", "sort-order", "search-string", "sort-field"].iter().map(|v|*v)); + v.extend(["ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -5085,7 +5085,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["ids", "max-results", "page-token", "sort-order", "search-string", "sort-field"].iter().map(|v|*v)); + v.extend(["ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -5525,7 +5525,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["ids", "max-results", "page-token", "sort-order", "search-string", "advertiser-ids", "sort-field"].iter().map(|v|*v)); + v.extend(["advertiser-ids", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -5943,7 +5943,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["ids", "group-number", "max-results", "page-token", "sort-order", "search-string", "advertiser-ids", "sort-field"].iter().map(|v|*v)); + v.extend(["advertiser-ids", "group-number", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -6455,7 +6455,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["archived", "ids", "types", "max-results", "active", "companion-creative-ids", "page-token", "campaign-id", "creative-field-ids", "rendering-ids", "search-string", "sort-order", "studio-creative-id", "advertiser-id", "sort-field", "size-ids"].iter().map(|v|*v)); + v.extend(["active", "advertiser-id", "archived", "campaign-id", "companion-creative-ids", "creative-field-ids", "ids", "max-results", "page-token", "rendering-ids", "search-string", "size-ids", "sort-field", "sort-order", "studio-creative-id", "types"].iter().map(|v|*v)); v } )); } } @@ -6880,7 +6880,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -7006,7 +7006,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["ids", "max-results", "page-token", "directory-site-ids", "sort-order", "search-string", "sort-field"].iter().map(|v|*v)); + v.extend(["directory-site-ids", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -7262,7 +7262,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["accepts-publisher-paid-placements", "ids", "max-results", "active", "parent-id", "page-token", "accepts-interstitial-placements", "accepts-in-stream-video-placements", "sort-order", "search-string", "country-id", "sort-field", "dfp-network-code"].iter().map(|v|*v)); + v.extend(["accepts-in-stream-video-placements", "accepts-interstitial-placements", "accepts-publisher-paid-placements", "active", "country-id", "dfp-network-code", "ids", "max-results", "page-token", "parent-id", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -7459,7 +7459,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["names", "advertiser-id", "object-type", "object-id"].iter().map(|v|*v)); + v.extend(["advertiser-id", "names", "object-id", "object-type"].iter().map(|v|*v)); v } )); } } @@ -7750,7 +7750,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["ids", "definitions-only", "event-tag-types", "campaign-id", "sort-order", "search-string", "enabled", "advertiser-id", "sort-field", "ad-id"].iter().map(|v|*v)); + v.extend(["ad-id", "advertiser-id", "campaign-id", "definitions-only", "enabled", "event-tag-types", "ids", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -8104,7 +8104,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "page-token", "scope", "sort-order", "sort-field"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "scope", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -8473,7 +8473,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["ids", "max-results", "floodlight-activity-group-ids", "page-token", "floodlight-activity-group-type", "floodlight-configuration-id", "sort-order", "search-string", "floodlight-activity-group-name", "advertiser-id", "tag-string", "sort-field", "floodlight-activity-group-tag-string"].iter().map(|v|*v)); + v.extend(["advertiser-id", "floodlight-activity-group-ids", "floodlight-activity-group-name", "floodlight-activity-group-tag-string", "floodlight-activity-group-type", "floodlight-configuration-id", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order", "tag-string"].iter().map(|v|*v)); v } )); } } @@ -8966,7 +8966,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["type", "ids", "max-results", "page-token", "floodlight-configuration-id", "sort-order", "search-string", "advertiser-id", "sort-field"].iter().map(|v|*v)); + v.extend(["advertiser-id", "floodlight-configuration-id", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order", "type"].iter().map(|v|*v)); v } )); } } @@ -9652,7 +9652,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["type", "ids", "max-results", "page-token", "site-id", "sort-order", "in-plan", "sort-field", "order-id"].iter().map(|v|*v)); + v.extend(["ids", "in-plan", "max-results", "order-id", "page-token", "site-id", "sort-field", "sort-order", "type"].iter().map(|v|*v)); v } )); } } @@ -10200,7 +10200,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["ids", "max-results", "page-token", "site-id", "sort-order", "search-string", "approved", "sort-field", "order-id"].iter().map(|v|*v)); + v.extend(["approved", "ids", "max-results", "order-id", "page-token", "search-string", "site-id", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -10326,7 +10326,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["ids", "max-results", "page-token", "site-id", "sort-order", "search-string", "sort-field"].iter().map(|v|*v)); + v.extend(["ids", "max-results", "page-token", "search-string", "site-id", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -10635,7 +10635,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["placement-group-type", "min-end-date", "max-results", "page-token", "archived", "pricing-types", "min-start-date", "search-string", "content-category-ids", "ids", "campaign-ids", "max-end-date", "directory-site-ids", "max-start-date", "advertiser-ids", "placement-strategy-ids", "site-ids", "sort-order", "sort-field"].iter().map(|v|*v)); + v.extend(["advertiser-ids", "archived", "campaign-ids", "content-category-ids", "directory-site-ids", "ids", "max-end-date", "max-results", "max-start-date", "min-end-date", "min-start-date", "page-token", "placement-group-type", "placement-strategy-ids", "pricing-types", "search-string", "site-ids", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -11184,7 +11184,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["ids", "max-results", "page-token", "sort-order", "search-string", "sort-field"].iter().map(|v|*v)); + v.extend(["ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -11774,7 +11774,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["min-end-date", "max-results", "compatibilities", "page-token", "archived", "pricing-types", "min-start-date", "content-category-ids", "search-string", "ids", "campaign-ids", "group-ids", "max-end-date", "directory-site-ids", "max-start-date", "advertiser-ids", "size-ids", "placement-strategy-ids", "payment-source", "site-ids", "sort-order", "sort-field"].iter().map(|v|*v)); + v.extend(["advertiser-ids", "archived", "campaign-ids", "compatibilities", "content-category-ids", "directory-site-ids", "group-ids", "ids", "max-end-date", "max-results", "max-start-date", "min-end-date", "min-start-date", "page-token", "payment-source", "placement-strategy-ids", "pricing-types", "search-string", "site-ids", "size-ids", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -12470,7 +12470,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["ids", "max-results", "page-token", "sort-order", "search-string", "advertiser-ids", "sort-field"].iter().map(|v|*v)); + v.extend(["advertiser-ids", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -12979,7 +12979,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["floodlight-activity-id", "name", "max-results", "active", "page-token", "sort-order", "sort-field"].iter().map(|v|*v)); + v.extend(["active", "floodlight-activity-id", "max-results", "name", "page-token", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -13521,7 +13521,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "sort-field", "page-token", "sort-order"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -13806,7 +13806,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "page-token", "scope", "sort-order", "sort-field"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "scope", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -14459,7 +14459,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["unmapped-site", "ids", "subaccount-id", "accepts-publisher-paid-placements", "max-results", "campaign-ids", "page-token", "directory-site-ids", "ad-words-site", "accepts-interstitial-placements", "accepts-in-stream-video-placements", "sort-order", "search-string", "approved", "sort-field"].iter().map(|v|*v)); + v.extend(["accepts-in-stream-video-placements", "accepts-interstitial-placements", "accepts-publisher-paid-placements", "ad-words-site", "approved", "campaign-ids", "directory-site-ids", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order", "subaccount-id", "unmapped-site"].iter().map(|v|*v)); v } )); } } @@ -14899,7 +14899,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["ids", "width", "iab-standard", "height"].iter().map(|v|*v)); + v.extend(["height", "iab-standard", "ids", "width"].iter().map(|v|*v)); v } )); } } @@ -15111,7 +15111,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["ids", "max-results", "page-token", "sort-order", "search-string", "sort-field"].iter().map(|v|*v)); + v.extend(["ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -15412,7 +15412,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["name", "max-results", "active", "page-token", "sort-order", "sort-field"].iter().map(|v|*v)); + v.extend(["active", "max-results", "name", "page-token", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -15640,7 +15640,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["ids", "max-results", "page-token", "sort-order", "search-string", "advertiser-id", "sort-field"].iter().map(|v|*v)); + v.extend(["advertiser-id", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -16424,7 +16424,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["account-user-role-only", "ids", "subaccount-id", "max-results", "page-token", "sort-order", "search-string", "sort-field"].iter().map(|v|*v)); + v.extend(["account-user-role-only", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order", "subaccount-id"].iter().map(|v|*v)); v } )); } } diff --git a/gen/dfareporting3/src/api.rs b/gen/dfareporting3/src/api.rs index 7072edb015..c6a2ba5ce8 100644 --- a/gen/dfareporting3/src/api.rs +++ b/gen/dfareporting3/src/api.rs @@ -14289,25 +14289,15 @@ impl<'a, C> AccountActiveAdSummaryGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14315,13 +14305,15 @@ impl<'a, C> AccountActiveAdSummaryGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14560,25 +14552,15 @@ impl<'a, C> AccountPermissionGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14586,13 +14568,15 @@ impl<'a, C> AccountPermissionGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14829,25 +14813,15 @@ impl<'a, C> AccountPermissionGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14855,13 +14829,15 @@ impl<'a, C> AccountPermissionGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15090,25 +15066,15 @@ impl<'a, C> AccountPermissionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15116,13 +15082,15 @@ impl<'a, C> AccountPermissionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15359,25 +15327,15 @@ impl<'a, C> AccountPermissionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15385,13 +15343,15 @@ impl<'a, C> AccountPermissionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15620,25 +15580,15 @@ impl<'a, C> AccountUserProfileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15646,13 +15596,15 @@ impl<'a, C> AccountUserProfileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15910,25 +15862,15 @@ impl<'a, C> AccountUserProfileInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15936,13 +15878,15 @@ impl<'a, C> AccountUserProfileInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16225,25 +16169,15 @@ impl<'a, C> AccountUserProfileListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16251,13 +16185,15 @@ impl<'a, C> AccountUserProfileListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16571,25 +16507,15 @@ impl<'a, C> AccountUserProfilePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16597,13 +16523,15 @@ impl<'a, C> AccountUserProfilePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16870,25 +16798,15 @@ impl<'a, C> AccountUserProfileUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16896,13 +16814,15 @@ impl<'a, C> AccountUserProfileUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17140,25 +17060,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17166,13 +17076,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17446,25 +17358,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17472,13 +17374,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17778,25 +17682,15 @@ impl<'a, C> AccountPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17804,13 +17698,15 @@ impl<'a, C> AccountPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18077,25 +17973,15 @@ impl<'a, C> AccountUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18103,13 +17989,15 @@ impl<'a, C> AccountUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18347,25 +18235,15 @@ impl<'a, C> AdGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18373,13 +18251,15 @@ impl<'a, C> AdGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18637,25 +18517,15 @@ impl<'a, C> AdInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18663,13 +18533,15 @@ impl<'a, C> AdInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19040,25 +18912,15 @@ impl<'a, C> AdListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19066,13 +18928,15 @@ impl<'a, C> AdListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19493,25 +19357,15 @@ impl<'a, C> AdPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19519,13 +19373,15 @@ impl<'a, C> AdPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19792,25 +19648,15 @@ impl<'a, C> AdUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19818,13 +19664,15 @@ impl<'a, C> AdUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20061,25 +19909,15 @@ impl<'a, C> AdvertiserGroupDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20087,11 +19925,11 @@ impl<'a, C> AdvertiserGroupDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -20324,25 +20162,15 @@ impl<'a, C> AdvertiserGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20350,13 +20178,15 @@ impl<'a, C> AdvertiserGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20614,25 +20444,15 @@ impl<'a, C> AdvertiserGroupInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20640,13 +20460,15 @@ impl<'a, C> AdvertiserGroupInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20914,25 +20736,15 @@ impl<'a, C> AdvertiserGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20940,13 +20752,15 @@ impl<'a, C> AdvertiserGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21239,25 +21053,15 @@ impl<'a, C> AdvertiserGroupPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21265,13 +21069,15 @@ impl<'a, C> AdvertiserGroupPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21538,25 +21344,15 @@ impl<'a, C> AdvertiserGroupUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21564,13 +21360,15 @@ impl<'a, C> AdvertiserGroupUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21808,25 +21606,15 @@ impl<'a, C> AdvertiserLandingPageGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21834,13 +21622,15 @@ impl<'a, C> AdvertiserLandingPageGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22098,25 +21888,15 @@ impl<'a, C> AdvertiserLandingPageInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22124,13 +21904,15 @@ impl<'a, C> AdvertiserLandingPageInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22415,25 +22197,15 @@ impl<'a, C> AdvertiserLandingPageListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22441,13 +22213,15 @@ impl<'a, C> AdvertiserLandingPageListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22762,25 +22536,15 @@ impl<'a, C> AdvertiserLandingPagePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22788,13 +22552,15 @@ impl<'a, C> AdvertiserLandingPagePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23061,25 +22827,15 @@ impl<'a, C> AdvertiserLandingPageUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23087,13 +22843,15 @@ impl<'a, C> AdvertiserLandingPageUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23331,25 +23089,15 @@ impl<'a, C> AdvertiserGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23357,13 +23105,15 @@ impl<'a, C> AdvertiserGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23621,25 +23371,15 @@ impl<'a, C> AdvertiserInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23647,13 +23387,15 @@ impl<'a, C> AdvertiserInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23955,25 +23697,15 @@ impl<'a, C> AdvertiserListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23981,13 +23713,15 @@ impl<'a, C> AdvertiserListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24324,25 +24058,15 @@ impl<'a, C> AdvertiserPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24350,13 +24074,15 @@ impl<'a, C> AdvertiserPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24623,25 +24349,15 @@ impl<'a, C> AdvertiserUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24649,13 +24365,15 @@ impl<'a, C> AdvertiserUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24891,25 +24609,15 @@ impl<'a, C> BrowserListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24917,13 +24625,15 @@ impl<'a, C> BrowserListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25173,25 +24883,15 @@ impl<'a, C> CampaignCreativeAssociationInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25199,13 +24899,15 @@ impl<'a, C> CampaignCreativeAssociationInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25468,25 +25170,15 @@ impl<'a, C> CampaignCreativeAssociationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25494,13 +25186,15 @@ impl<'a, C> CampaignCreativeAssociationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25760,25 +25454,15 @@ impl<'a, C> CampaignGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25786,13 +25470,15 @@ impl<'a, C> CampaignGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26050,25 +25736,15 @@ impl<'a, C> CampaignInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26076,13 +25752,15 @@ impl<'a, C> CampaignInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26391,25 +26069,15 @@ impl<'a, C> CampaignListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26417,13 +26085,15 @@ impl<'a, C> CampaignListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26768,25 +26438,15 @@ impl<'a, C> CampaignPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26794,13 +26454,15 @@ impl<'a, C> CampaignPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27067,25 +26729,15 @@ impl<'a, C> CampaignUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27093,13 +26745,15 @@ impl<'a, C> CampaignUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27337,25 +26991,15 @@ impl<'a, C> ChangeLogGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27363,13 +27007,15 @@ impl<'a, C> ChangeLogGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27662,25 +27308,15 @@ impl<'a, C> ChangeLogListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27688,13 +27324,15 @@ impl<'a, C> ChangeLogListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28020,25 +27658,15 @@ impl<'a, C> CityListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28046,13 +27674,15 @@ impl<'a, C> CityListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28312,25 +27942,15 @@ impl<'a, C> ConnectionTypeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28338,13 +27958,15 @@ impl<'a, C> ConnectionTypeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28581,25 +28203,15 @@ impl<'a, C> ConnectionTypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28607,13 +28219,15 @@ impl<'a, C> ConnectionTypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28841,25 +28455,15 @@ impl<'a, C> ContentCategoryDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28867,11 +28471,11 @@ impl<'a, C> ContentCategoryDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -29104,25 +28708,15 @@ impl<'a, C> ContentCategoryGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29130,13 +28724,15 @@ impl<'a, C> ContentCategoryGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29394,25 +28990,15 @@ impl<'a, C> ContentCategoryInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29420,13 +29006,15 @@ impl<'a, C> ContentCategoryInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29694,25 +29282,15 @@ impl<'a, C> ContentCategoryListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29720,13 +29298,15 @@ impl<'a, C> ContentCategoryListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30019,25 +29599,15 @@ impl<'a, C> ContentCategoryPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30045,13 +29615,15 @@ impl<'a, C> ContentCategoryPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30318,25 +29890,15 @@ impl<'a, C> ContentCategoryUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30344,13 +29906,15 @@ impl<'a, C> ContentCategoryUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30607,25 +30171,15 @@ impl<'a, C> ConversionBatchinsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30633,13 +30187,15 @@ impl<'a, C> ConversionBatchinsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30896,25 +30452,15 @@ impl<'a, C> ConversionBatchupdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30922,13 +30468,15 @@ impl<'a, C> ConversionBatchupdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31166,25 +30714,15 @@ impl<'a, C> CountryGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31192,13 +30730,15 @@ impl<'a, C> CountryGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31435,25 +30975,15 @@ impl<'a, C> CountryListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31461,13 +30991,15 @@ impl<'a, C> CountryListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31762,25 +31294,15 @@ impl<'a, C> CreativeAssetInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31788,7 +31310,7 @@ impl<'a, C> CreativeAssetInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -31800,7 +31322,7 @@ impl<'a, C> CreativeAssetInsertCall<'a, C> where C: BorrowMut CreativeAssetInsertCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32114,25 +31638,15 @@ impl<'a, C> CreativeFieldValueDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32140,11 +31654,11 @@ impl<'a, C> CreativeFieldValueDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -32389,25 +31903,15 @@ impl<'a, C> CreativeFieldValueGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32415,13 +31919,15 @@ impl<'a, C> CreativeFieldValueGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32691,25 +32197,15 @@ impl<'a, C> CreativeFieldValueInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32717,13 +32213,15 @@ impl<'a, C> CreativeFieldValueInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33003,25 +32501,15 @@ impl<'a, C> CreativeFieldValueListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33029,13 +32517,15 @@ impl<'a, C> CreativeFieldValueListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33340,25 +32830,15 @@ impl<'a, C> CreativeFieldValuePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33366,13 +32846,15 @@ impl<'a, C> CreativeFieldValuePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33651,25 +33133,15 @@ impl<'a, C> CreativeFieldValueUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33677,13 +33149,15 @@ impl<'a, C> CreativeFieldValueUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33930,25 +33404,15 @@ impl<'a, C> CreativeFieldDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33956,11 +33420,11 @@ impl<'a, C> CreativeFieldDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -34193,25 +33657,15 @@ impl<'a, C> CreativeFieldGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34219,13 +33673,15 @@ impl<'a, C> CreativeFieldGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34483,25 +33939,15 @@ impl<'a, C> CreativeFieldInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34509,13 +33955,15 @@ impl<'a, C> CreativeFieldInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34790,25 +34238,15 @@ impl<'a, C> CreativeFieldListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34816,13 +34254,15 @@ impl<'a, C> CreativeFieldListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35123,25 +34563,15 @@ impl<'a, C> CreativeFieldPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35149,13 +34579,15 @@ impl<'a, C> CreativeFieldPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35422,25 +34854,15 @@ impl<'a, C> CreativeFieldUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35448,13 +34870,15 @@ impl<'a, C> CreativeFieldUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35692,25 +35116,15 @@ impl<'a, C> CreativeGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35718,13 +35132,15 @@ impl<'a, C> CreativeGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35982,25 +35398,15 @@ impl<'a, C> CreativeGroupInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36008,13 +35414,15 @@ impl<'a, C> CreativeGroupInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36294,25 +35702,15 @@ impl<'a, C> CreativeGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36320,13 +35718,15 @@ impl<'a, C> CreativeGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36634,25 +36034,15 @@ impl<'a, C> CreativeGroupPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36660,13 +36050,15 @@ impl<'a, C> CreativeGroupPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36933,25 +36325,15 @@ impl<'a, C> CreativeGroupUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36959,13 +36341,15 @@ impl<'a, C> CreativeGroupUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37203,25 +36587,15 @@ impl<'a, C> CreativeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37229,13 +36603,15 @@ impl<'a, C> CreativeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37493,25 +36869,15 @@ impl<'a, C> CreativeInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37519,13 +36885,15 @@ impl<'a, C> CreativeInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37853,25 +37221,15 @@ impl<'a, C> CreativeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37879,13 +37237,15 @@ impl<'a, C> CreativeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38253,25 +37613,15 @@ impl<'a, C> CreativePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38279,13 +37629,15 @@ impl<'a, C> CreativePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38552,25 +37904,15 @@ impl<'a, C> CreativeUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38578,13 +37920,15 @@ impl<'a, C> CreativeUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38851,25 +38195,15 @@ impl<'a, C> DimensionValueQueryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38877,13 +38211,15 @@ impl<'a, C> DimensionValueQueryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39135,25 +38471,15 @@ impl<'a, C> DirectorySiteContactGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39161,13 +38487,15 @@ impl<'a, C> DirectorySiteContactGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39443,25 +38771,15 @@ impl<'a, C> DirectorySiteContactListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39469,13 +38787,15 @@ impl<'a, C> DirectorySiteContactListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39755,25 +39075,15 @@ impl<'a, C> DirectorySiteGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39781,13 +39091,15 @@ impl<'a, C> DirectorySiteGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40045,25 +39357,15 @@ impl<'a, C> DirectorySiteInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40071,13 +39373,15 @@ impl<'a, C> DirectorySiteInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40380,25 +39684,15 @@ impl<'a, C> DirectorySiteListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40406,13 +39700,15 @@ impl<'a, C> DirectorySiteListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40736,25 +40032,15 @@ impl<'a, C> DynamicTargetingKeyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40762,11 +40048,11 @@ impl<'a, C> DynamicTargetingKeyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -41038,25 +40324,15 @@ impl<'a, C> DynamicTargetingKeyInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41064,13 +40340,15 @@ impl<'a, C> DynamicTargetingKeyInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41328,25 +40606,15 @@ impl<'a, C> DynamicTargetingKeyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41354,13 +40622,15 @@ impl<'a, C> DynamicTargetingKeyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41617,25 +40887,15 @@ impl<'a, C> EventTagDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41643,11 +40903,11 @@ impl<'a, C> EventTagDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -41880,25 +41140,15 @@ impl<'a, C> EventTagGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41906,13 +41156,15 @@ impl<'a, C> EventTagGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42170,25 +41422,15 @@ impl<'a, C> EventTagInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42196,13 +41438,15 @@ impl<'a, C> EventTagInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42492,25 +41736,15 @@ impl<'a, C> EventTagListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42518,13 +41752,15 @@ impl<'a, C> EventTagListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42846,25 +42082,15 @@ impl<'a, C> EventTagPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42872,13 +42098,15 @@ impl<'a, C> EventTagPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43145,25 +42373,15 @@ impl<'a, C> EventTagUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43171,13 +42389,15 @@ impl<'a, C> EventTagUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43436,25 +42656,15 @@ impl<'a, C> FileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43462,19 +42672,21 @@ impl<'a, C> FileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = if enable_resource_parsing { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); } } - } else { (reconstructed_result, Default::default()) }; + } else { (res, Default::default()) }; dlg.finished(true); return Ok(result_value) @@ -43730,25 +42942,15 @@ impl<'a, C> FileListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43756,13 +42958,15 @@ impl<'a, C> FileListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44025,25 +43229,15 @@ impl<'a, C> FloodlightActivityDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44051,11 +43245,11 @@ impl<'a, C> FloodlightActivityDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -44291,25 +43485,15 @@ impl<'a, C> FloodlightActivityGeneratetagCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44317,13 +43501,15 @@ impl<'a, C> FloodlightActivityGeneratetagCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44559,25 +43745,15 @@ impl<'a, C> FloodlightActivityGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44585,13 +43761,15 @@ impl<'a, C> FloodlightActivityGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44849,25 +44027,15 @@ impl<'a, C> FloodlightActivityInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44875,13 +44043,15 @@ impl<'a, C> FloodlightActivityInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45186,25 +44356,15 @@ impl<'a, C> FloodlightActivityListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45212,13 +44372,15 @@ impl<'a, C> FloodlightActivityListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45561,25 +44723,15 @@ impl<'a, C> FloodlightActivityPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45587,13 +44739,15 @@ impl<'a, C> FloodlightActivityPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45860,25 +45014,15 @@ impl<'a, C> FloodlightActivityUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45886,13 +45030,15 @@ impl<'a, C> FloodlightActivityUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46130,25 +45276,15 @@ impl<'a, C> FloodlightActivityGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46156,13 +45292,15 @@ impl<'a, C> FloodlightActivityGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46420,25 +45558,15 @@ impl<'a, C> FloodlightActivityGroupInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46446,13 +45574,15 @@ impl<'a, C> FloodlightActivityGroupInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46735,25 +45865,15 @@ impl<'a, C> FloodlightActivityGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46761,13 +45881,15 @@ impl<'a, C> FloodlightActivityGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47081,25 +46203,15 @@ impl<'a, C> FloodlightActivityGroupPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47107,13 +46219,15 @@ impl<'a, C> FloodlightActivityGroupPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47380,25 +46494,15 @@ impl<'a, C> FloodlightActivityGroupUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47406,13 +46510,15 @@ impl<'a, C> FloodlightActivityGroupUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47650,25 +46756,15 @@ impl<'a, C> FloodlightConfigurationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47676,13 +46772,15 @@ impl<'a, C> FloodlightConfigurationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47926,25 +47024,15 @@ impl<'a, C> FloodlightConfigurationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47952,13 +47040,15 @@ impl<'a, C> FloodlightConfigurationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -48216,25 +47306,15 @@ impl<'a, C> FloodlightConfigurationPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -48242,13 +47322,15 @@ impl<'a, C> FloodlightConfigurationPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -48515,25 +47597,15 @@ impl<'a, C> FloodlightConfigurationUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -48541,13 +47613,15 @@ impl<'a, C> FloodlightConfigurationUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -48787,25 +47861,15 @@ impl<'a, C> InventoryItemGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -48813,13 +47877,15 @@ impl<'a, C> InventoryItemGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49119,25 +48185,15 @@ impl<'a, C> InventoryItemListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -49145,13 +48201,15 @@ impl<'a, C> InventoryItemListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49454,25 +48512,15 @@ impl<'a, C> LanguageListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -49480,13 +48528,15 @@ impl<'a, C> LanguageListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49713,25 +48763,15 @@ impl<'a, C> MetroListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -49739,13 +48779,15 @@ impl<'a, C> MetroListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49974,25 +49016,15 @@ impl<'a, C> MobileCarrierGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -50000,13 +49032,15 @@ impl<'a, C> MobileCarrierGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -50243,25 +49277,15 @@ impl<'a, C> MobileCarrierListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -50269,13 +49293,15 @@ impl<'a, C> MobileCarrierListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -50504,25 +49530,15 @@ impl<'a, C> OperatingSystemVersionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -50530,13 +49546,15 @@ impl<'a, C> OperatingSystemVersionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -50773,25 +49791,15 @@ impl<'a, C> OperatingSystemVersionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -50799,13 +49807,15 @@ impl<'a, C> OperatingSystemVersionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51034,25 +50044,15 @@ impl<'a, C> OperatingSystemGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51060,13 +50060,15 @@ impl<'a, C> OperatingSystemGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51303,25 +50305,15 @@ impl<'a, C> OperatingSystemListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51329,13 +50321,15 @@ impl<'a, C> OperatingSystemListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51566,25 +50560,15 @@ impl<'a, C> OrderDocumentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51592,13 +50576,15 @@ impl<'a, C> OrderDocumentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51898,25 +50884,15 @@ impl<'a, C> OrderDocumentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51924,13 +50900,15 @@ impl<'a, C> OrderDocumentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -52237,25 +51215,15 @@ impl<'a, C> OrderGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -52263,13 +51231,15 @@ impl<'a, C> OrderGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -52557,25 +51527,15 @@ impl<'a, C> OrderListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -52583,13 +51543,15 @@ impl<'a, C> OrderListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -52879,25 +51841,15 @@ impl<'a, C> PlacementGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -52905,13 +51857,15 @@ impl<'a, C> PlacementGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -53169,25 +52123,15 @@ impl<'a, C> PlacementGroupInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -53195,13 +52139,15 @@ impl<'a, C> PlacementGroupInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -53548,25 +52494,15 @@ impl<'a, C> PlacementGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -53574,13 +52510,15 @@ impl<'a, C> PlacementGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -53971,25 +52909,15 @@ impl<'a, C> PlacementGroupPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -53997,13 +52925,15 @@ impl<'a, C> PlacementGroupPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -54270,25 +53200,15 @@ impl<'a, C> PlacementGroupUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -54296,13 +53216,15 @@ impl<'a, C> PlacementGroupUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -54539,25 +53461,15 @@ impl<'a, C> PlacementStrategyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -54565,11 +53477,11 @@ impl<'a, C> PlacementStrategyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -54802,25 +53714,15 @@ impl<'a, C> PlacementStrategyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -54828,13 +53730,15 @@ impl<'a, C> PlacementStrategyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -55092,25 +53996,15 @@ impl<'a, C> PlacementStrategyInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -55118,13 +54012,15 @@ impl<'a, C> PlacementStrategyInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -55392,25 +54288,15 @@ impl<'a, C> PlacementStrategyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -55418,13 +54304,15 @@ impl<'a, C> PlacementStrategyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -55717,25 +54605,15 @@ impl<'a, C> PlacementStrategyPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -55743,13 +54621,15 @@ impl<'a, C> PlacementStrategyPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -56016,25 +54896,15 @@ impl<'a, C> PlacementStrategyUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -56042,13 +54912,15 @@ impl<'a, C> PlacementStrategyUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -56303,25 +55175,15 @@ impl<'a, C> PlacementGeneratetagCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -56329,13 +55191,15 @@ impl<'a, C> PlacementGeneratetagCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -56589,25 +55453,15 @@ impl<'a, C> PlacementGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -56615,13 +55469,15 @@ impl<'a, C> PlacementGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -56879,25 +55735,15 @@ impl<'a, C> PlacementInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -56905,13 +55751,15 @@ impl<'a, C> PlacementInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -57279,25 +56127,15 @@ impl<'a, C> PlacementListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -57305,13 +56143,15 @@ impl<'a, C> PlacementListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -57726,25 +56566,15 @@ impl<'a, C> PlacementPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -57752,13 +56582,15 @@ impl<'a, C> PlacementPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -58025,25 +56857,15 @@ impl<'a, C> PlacementUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -58051,13 +56873,15 @@ impl<'a, C> PlacementUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -58295,25 +57119,15 @@ impl<'a, C> PlatformTypeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -58321,13 +57135,15 @@ impl<'a, C> PlatformTypeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -58564,25 +57380,15 @@ impl<'a, C> PlatformTypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -58590,13 +57396,15 @@ impl<'a, C> PlatformTypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -58825,25 +57633,15 @@ impl<'a, C> PostalCodeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -58851,13 +57649,15 @@ impl<'a, C> PostalCodeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -59094,25 +57894,15 @@ impl<'a, C> PostalCodeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -59120,13 +57910,15 @@ impl<'a, C> PostalCodeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -59355,25 +58147,15 @@ impl<'a, C> ProjectGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -59381,13 +58163,15 @@ impl<'a, C> ProjectGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -59663,25 +58447,15 @@ impl<'a, C> ProjectListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -59689,13 +58463,15 @@ impl<'a, C> ProjectListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -59973,25 +58749,15 @@ impl<'a, C> RegionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -59999,13 +58765,15 @@ impl<'a, C> RegionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -60234,25 +59002,15 @@ impl<'a, C> RemarketingListShareGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -60260,13 +59018,15 @@ impl<'a, C> RemarketingListShareGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -60526,25 +59286,15 @@ impl<'a, C> RemarketingListSharePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -60552,13 +59302,15 @@ impl<'a, C> RemarketingListSharePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -60825,25 +59577,15 @@ impl<'a, C> RemarketingListShareUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -60851,13 +59593,15 @@ impl<'a, C> RemarketingListShareUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -61095,25 +59839,15 @@ impl<'a, C> RemarketingListGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -61121,13 +59855,15 @@ impl<'a, C> RemarketingListGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -61385,25 +60121,15 @@ impl<'a, C> RemarketingListInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -61411,13 +60137,15 @@ impl<'a, C> RemarketingListInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -61690,25 +60418,15 @@ impl<'a, C> RemarketingListListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -61716,13 +60434,15 @@ impl<'a, C> RemarketingListListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -62031,25 +60751,15 @@ impl<'a, C> RemarketingListPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -62057,13 +60767,15 @@ impl<'a, C> RemarketingListPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -62330,25 +61042,15 @@ impl<'a, C> RemarketingListUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -62356,13 +61058,15 @@ impl<'a, C> RemarketingListUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -62619,25 +61323,15 @@ impl<'a, C> ReportCompatibleFieldQueryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -62645,13 +61339,15 @@ impl<'a, C> ReportCompatibleFieldQueryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -62912,25 +61608,15 @@ impl<'a, C> ReportFileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -62938,19 +61624,21 @@ impl<'a, C> ReportFileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = if enable_resource_parsing { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); } } - } else { (reconstructed_result, Default::default()) }; + } else { (res, Default::default()) }; dlg.finished(true); return Ok(result_value) @@ -63213,25 +61901,15 @@ impl<'a, C> ReportFileListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -63239,13 +61917,15 @@ impl<'a, C> ReportFileListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -63511,25 +62191,15 @@ impl<'a, C> ReportDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -63537,11 +62207,11 @@ impl<'a, C> ReportDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -63774,25 +62444,15 @@ impl<'a, C> ReportGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -63800,13 +62460,15 @@ impl<'a, C> ReportGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -64064,25 +62726,15 @@ impl<'a, C> ReportInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -64090,13 +62742,15 @@ impl<'a, C> ReportInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -64357,25 +63011,15 @@ impl<'a, C> ReportListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -64383,13 +63027,15 @@ impl<'a, C> ReportListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -64674,25 +63320,15 @@ impl<'a, C> ReportPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -64700,13 +63336,15 @@ impl<'a, C> ReportPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -64959,25 +63597,15 @@ impl<'a, C> ReportRunCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -64985,13 +63613,15 @@ impl<'a, C> ReportRunCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -65258,25 +63888,15 @@ impl<'a, C> ReportUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -65284,13 +63904,15 @@ impl<'a, C> ReportUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -65538,25 +64160,15 @@ impl<'a, C> SiteGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -65564,13 +64176,15 @@ impl<'a, C> SiteGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -65828,25 +64442,15 @@ impl<'a, C> SiteInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -65854,13 +64458,15 @@ impl<'a, C> SiteInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -66177,25 +64783,15 @@ impl<'a, C> SiteListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -66203,13 +64799,15 @@ impl<'a, C> SiteListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -66567,25 +65165,15 @@ impl<'a, C> SitePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -66593,13 +65181,15 @@ impl<'a, C> SitePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -66866,25 +65456,15 @@ impl<'a, C> SiteUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -66892,13 +65472,15 @@ impl<'a, C> SiteUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -67136,25 +65718,15 @@ impl<'a, C> SizeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -67162,13 +65734,15 @@ impl<'a, C> SizeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -67426,25 +66000,15 @@ impl<'a, C> SizeInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -67452,13 +66016,15 @@ impl<'a, C> SizeInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -67716,25 +66282,15 @@ impl<'a, C> SizeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -67742,13 +66298,15 @@ impl<'a, C> SizeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -68006,25 +66564,15 @@ impl<'a, C> SubaccountGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -68032,13 +66580,15 @@ impl<'a, C> SubaccountGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -68296,25 +66846,15 @@ impl<'a, C> SubaccountInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -68322,13 +66862,15 @@ impl<'a, C> SubaccountInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -68596,25 +67138,15 @@ impl<'a, C> SubaccountListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -68622,13 +67154,15 @@ impl<'a, C> SubaccountListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -68921,25 +67455,15 @@ impl<'a, C> SubaccountPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -68947,13 +67471,15 @@ impl<'a, C> SubaccountPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -69220,25 +67746,15 @@ impl<'a, C> SubaccountUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -69246,13 +67762,15 @@ impl<'a, C> SubaccountUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -69490,25 +68008,15 @@ impl<'a, C> TargetableRemarketingListGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -69516,13 +68024,15 @@ impl<'a, C> TargetableRemarketingListGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -69791,25 +68301,15 @@ impl<'a, C> TargetableRemarketingListListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -69817,13 +68317,15 @@ impl<'a, C> TargetableRemarketingListListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -70104,25 +68606,15 @@ impl<'a, C> TargetingTemplateGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -70130,13 +68622,15 @@ impl<'a, C> TargetingTemplateGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -70394,25 +68888,15 @@ impl<'a, C> TargetingTemplateInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -70420,13 +68904,15 @@ impl<'a, C> TargetingTemplateInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -70699,25 +69185,15 @@ impl<'a, C> TargetingTemplateListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -70725,13 +69201,15 @@ impl<'a, C> TargetingTemplateListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -71031,25 +69509,15 @@ impl<'a, C> TargetingTemplatePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -71057,13 +69525,15 @@ impl<'a, C> TargetingTemplatePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -71330,25 +69800,15 @@ impl<'a, C> TargetingTemplateUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -71356,13 +69816,15 @@ impl<'a, C> TargetingTemplateUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -71598,25 +70060,15 @@ impl<'a, C> UserProfileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -71624,13 +70076,15 @@ impl<'a, C> UserProfileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -71834,25 +70288,15 @@ impl<'a, C> UserProfileListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -71860,13 +70304,15 @@ impl<'a, C> UserProfileListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -72085,25 +70531,15 @@ impl<'a, C> UserRolePermissionGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -72111,13 +70547,15 @@ impl<'a, C> UserRolePermissionGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -72354,25 +70792,15 @@ impl<'a, C> UserRolePermissionGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -72380,13 +70808,15 @@ impl<'a, C> UserRolePermissionGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -72615,25 +71045,15 @@ impl<'a, C> UserRolePermissionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -72641,13 +71061,15 @@ impl<'a, C> UserRolePermissionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -72891,25 +71313,15 @@ impl<'a, C> UserRolePermissionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -72917,13 +71329,15 @@ impl<'a, C> UserRolePermissionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -73159,25 +71573,15 @@ impl<'a, C> UserRoleDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -73185,11 +71589,11 @@ impl<'a, C> UserRoleDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -73422,25 +71826,15 @@ impl<'a, C> UserRoleGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -73448,13 +71842,15 @@ impl<'a, C> UserRoleGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -73712,25 +72108,15 @@ impl<'a, C> UserRoleInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -73738,13 +72124,15 @@ impl<'a, C> UserRoleInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -74022,25 +72410,15 @@ impl<'a, C> UserRoleListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -74048,13 +72426,15 @@ impl<'a, C> UserRoleListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -74361,25 +72741,15 @@ impl<'a, C> UserRolePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -74387,13 +72757,15 @@ impl<'a, C> UserRolePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -74660,25 +73032,15 @@ impl<'a, C> UserRoleUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -74686,13 +73048,15 @@ impl<'a, C> UserRoleUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -74930,25 +73294,15 @@ impl<'a, C> VideoFormatGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -74956,13 +73310,15 @@ impl<'a, C> VideoFormatGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -75199,25 +73555,15 @@ impl<'a, C> VideoFormatListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -75225,13 +73571,15 @@ impl<'a, C> VideoFormatListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/dfareporting3/src/client.rs b/gen/dfareporting3/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/dfareporting3/src/client.rs +++ b/gen/dfareporting3/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/dfareporting3d2-cli/src/main.rs b/gen/dfareporting3d2-cli/src/main.rs index cc7d583a25..be4f494832 100644 --- a/gen/dfareporting3d2-cli/src/main.rs +++ b/gen/dfareporting3d2-cli/src/main.rs @@ -508,7 +508,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "active", "search-string", "sort-order", "ids", "sort-field", "user-role-id", "subaccount-id", "max-results"].iter().map(|v|*v)); + v.extend(["active", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order", "subaccount-id", "user-role-id"].iter().map(|v|*v)); v } )); } } @@ -850,7 +850,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "active", "search-string", "sort-order", "ids", "sort-field", "max-results"].iter().map(|v|*v)); + v.extend(["active", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -1386,7 +1386,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["compatibility", "ids", "dynamic-click-tracker", "max-results", "page-token", "archived", "advertiser-id", "ssl-compliant", "placement-ids", "audience-segment-ids", "overridden-event-tag-id", "creative-optimization-configuration-ids", "remarketing-list-ids", "creative-ids", "search-string", "sort-order", "type", "size-ids", "active", "landing-page-ids", "sort-field", "ssl-required", "campaign-ids"].iter().map(|v|*v)); + v.extend(["active", "advertiser-id", "archived", "audience-segment-ids", "campaign-ids", "compatibility", "creative-ids", "creative-optimization-configuration-ids", "dynamic-click-tracker", "ids", "landing-page-ids", "max-results", "overridden-event-tag-id", "page-token", "placement-ids", "remarketing-list-ids", "search-string", "size-ids", "sort-field", "sort-order", "ssl-compliant", "ssl-required", "type"].iter().map(|v|*v)); v } )); } } @@ -1941,7 +1941,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "search-string", "sort-order", "ids", "sort-field", "max-results"].iter().map(|v|*v)); + v.extend(["ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -2342,7 +2342,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "archived", "search-string", "sort-order", "ids", "advertiser-ids", "sort-field", "subaccount-id", "max-results", "campaign-ids"].iter().map(|v|*v)); + v.extend(["advertiser-ids", "archived", "campaign-ids", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order", "subaccount-id"].iter().map(|v|*v)); v } )); } } @@ -2772,7 +2772,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "search-string", "only-parent", "sort-order", "ids", "include-advertisers-without-groups-only", "sort-field", "status", "floodlight-configuration-ids", "subaccount-id", "advertiser-group-ids", "max-results"].iter().map(|v|*v)); + v.extend(["advertiser-group-ids", "floodlight-configuration-ids", "ids", "include-advertisers-without-groups-only", "max-results", "only-parent", "page-token", "search-string", "sort-field", "sort-order", "status", "subaccount-id"].iter().map(|v|*v)); v } )); } } @@ -3190,7 +3190,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results", "sort-order"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -3462,7 +3462,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "archived", "search-string", "sort-order", "ids", "advertiser-ids", "sort-field", "excluded-ids", "subaccount-id", "at-least-one-optimization-activity", "overridden-event-tag-id", "max-results", "advertiser-group-ids"].iter().map(|v|*v)); + v.extend(["advertiser-group-ids", "advertiser-ids", "archived", "at-least-one-optimization-activity", "excluded-ids", "ids", "max-results", "overridden-event-tag-id", "page-token", "search-string", "sort-field", "sort-order", "subaccount-id"].iter().map(|v|*v)); v } )); } } @@ -3853,7 +3853,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "search-string", "min-change-time", "max-change-time", "ids", "object-ids", "action", "max-results", "user-profile-ids", "object-type"].iter().map(|v|*v)); + v.extend(["action", "ids", "max-change-time", "max-results", "min-change-time", "object-ids", "object-type", "page-token", "search-string", "user-profile-ids"].iter().map(|v|*v)); v } )); } } @@ -3918,7 +3918,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["name-prefix", "dart-ids", "region-dart-ids", "country-dart-ids"].iter().map(|v|*v)); + v.extend(["country-dart-ids", "dart-ids", "name-prefix", "region-dart-ids"].iter().map(|v|*v)); v } )); } } @@ -4277,7 +4277,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "search-string", "sort-order", "ids", "sort-field", "max-results"].iter().map(|v|*v)); + v.extend(["ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -5088,7 +5088,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "search-string", "sort-order", "ids", "sort-field", "max-results"].iter().map(|v|*v)); + v.extend(["ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -5528,7 +5528,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "search-string", "sort-order", "ids", "advertiser-ids", "sort-field", "max-results"].iter().map(|v|*v)); + v.extend(["advertiser-ids", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -5946,7 +5946,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "search-string", "sort-order", "group-number", "ids", "advertiser-ids", "sort-field", "max-results"].iter().map(|v|*v)); + v.extend(["advertiser-ids", "group-number", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -6458,7 +6458,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["size-ids", "page-token", "companion-creative-ids", "archived", "search-string", "active", "sort-order", "advertiser-id", "ids", "campaign-id", "sort-field", "studio-creative-id", "types", "max-results", "creative-field-ids", "rendering-ids"].iter().map(|v|*v)); + v.extend(["active", "advertiser-id", "archived", "campaign-id", "companion-creative-ids", "creative-field-ids", "ids", "max-results", "page-token", "rendering-ids", "search-string", "size-ids", "sort-field", "sort-order", "studio-creative-id", "types"].iter().map(|v|*v)); v } )); } } @@ -6883,7 +6883,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -7009,7 +7009,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "directory-site-ids", "search-string", "sort-order", "ids", "sort-field", "max-results"].iter().map(|v|*v)); + v.extend(["directory-site-ids", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -7265,7 +7265,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["parent-id", "page-token", "active", "accepts-publisher-paid-placements", "search-string", "sort-order", "ids", "sort-field", "dfp-network-code", "accepts-interstitial-placements", "accepts-in-stream-video-placements", "max-results", "country-id"].iter().map(|v|*v)); + v.extend(["accepts-in-stream-video-placements", "accepts-interstitial-placements", "accepts-publisher-paid-placements", "active", "country-id", "dfp-network-code", "ids", "max-results", "page-token", "parent-id", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -7462,7 +7462,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["object-id", "object-type", "names", "advertiser-id"].iter().map(|v|*v)); + v.extend(["advertiser-id", "names", "object-id", "object-type"].iter().map(|v|*v)); v } )); } } @@ -7753,7 +7753,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["search-string", "sort-order", "advertiser-id", "ids", "campaign-id", "sort-field", "enabled", "definitions-only", "ad-id", "event-tag-types"].iter().map(|v|*v)); + v.extend(["ad-id", "advertiser-id", "campaign-id", "definitions-only", "enabled", "event-tag-types", "ids", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -8107,7 +8107,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "sort-order", "scope", "sort-field", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "scope", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -8476,7 +8476,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "tag-string", "search-string", "floodlight-configuration-id", "sort-order", "floodlight-activity-group-type", "ids", "floodlight-activity-group-ids", "advertiser-id", "sort-field", "floodlight-activity-group-tag-string", "max-results", "floodlight-activity-group-name"].iter().map(|v|*v)); + v.extend(["advertiser-id", "floodlight-activity-group-ids", "floodlight-activity-group-name", "floodlight-activity-group-tag-string", "floodlight-activity-group-type", "floodlight-configuration-id", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order", "tag-string"].iter().map(|v|*v)); v } )); } } @@ -8969,7 +8969,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "search-string", "floodlight-configuration-id", "sort-order", "advertiser-id", "ids", "sort-field", "type", "max-results"].iter().map(|v|*v)); + v.extend(["advertiser-id", "floodlight-configuration-id", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order", "type"].iter().map(|v|*v)); v } )); } } @@ -9655,7 +9655,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "order-id", "in-plan", "sort-order", "ids", "sort-field", "type", "max-results", "site-id"].iter().map(|v|*v)); + v.extend(["ids", "in-plan", "max-results", "order-id", "page-token", "site-id", "sort-field", "sort-order", "type"].iter().map(|v|*v)); v } )); } } @@ -9879,7 +9879,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "search-string", "directories", "ids", "max-results"].iter().map(|v|*v)); + v.extend(["directories", "ids", "max-results", "page-token", "search-string"].iter().map(|v|*v)); v } )); } } @@ -10323,7 +10323,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "order-id", "search-string", "sort-order", "ids", "sort-field", "max-results", "approved", "site-id"].iter().map(|v|*v)); + v.extend(["approved", "ids", "max-results", "order-id", "page-token", "search-string", "site-id", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -10449,7 +10449,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "search-string", "sort-order", "ids", "sort-field", "max-results", "site-id"].iter().map(|v|*v)); + v.extend(["ids", "max-results", "page-token", "search-string", "site-id", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -10758,7 +10758,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["ids", "advertiser-ids", "min-start-date", "placement-group-type", "max-results", "page-token", "archived", "placement-strategy-ids", "site-ids", "directory-site-ids", "max-start-date", "pricing-types", "search-string", "sort-order", "content-category-ids", "max-end-date", "min-end-date", "sort-field", "campaign-ids"].iter().map(|v|*v)); + v.extend(["advertiser-ids", "archived", "campaign-ids", "content-category-ids", "directory-site-ids", "ids", "max-end-date", "max-results", "max-start-date", "min-end-date", "min-start-date", "page-token", "placement-group-type", "placement-strategy-ids", "pricing-types", "search-string", "site-ids", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -11307,7 +11307,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "search-string", "sort-order", "ids", "sort-field", "max-results"].iter().map(|v|*v)); + v.extend(["ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -11897,7 +11897,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["ids", "advertiser-ids", "min-start-date", "payment-source", "max-results", "page-token", "archived", "placement-strategy-ids", "site-ids", "directory-site-ids", "max-start-date", "pricing-types", "search-string", "sort-order", "group-ids", "content-category-ids", "size-ids", "max-end-date", "min-end-date", "compatibilities", "sort-field", "campaign-ids"].iter().map(|v|*v)); + v.extend(["advertiser-ids", "archived", "campaign-ids", "compatibilities", "content-category-ids", "directory-site-ids", "group-ids", "ids", "max-end-date", "max-results", "max-start-date", "min-end-date", "min-start-date", "page-token", "payment-source", "placement-strategy-ids", "pricing-types", "search-string", "site-ids", "size-ids", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -12593,7 +12593,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "search-string", "sort-order", "ids", "advertiser-ids", "sort-field", "max-results"].iter().map(|v|*v)); + v.extend(["advertiser-ids", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -13102,7 +13102,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "floodlight-activity-id", "active", "name", "sort-order", "sort-field", "max-results"].iter().map(|v|*v)); + v.extend(["active", "floodlight-activity-id", "max-results", "name", "page-token", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -13644,7 +13644,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "sort-field", "max-results", "sort-order"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -13929,7 +13929,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "sort-order", "scope", "sort-field", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "scope", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -14582,7 +14582,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "directory-site-ids", "accepts-publisher-paid-placements", "search-string", "sort-order", "unmapped-site", "ids", "sort-field", "accepts-interstitial-placements", "accepts-in-stream-video-placements", "subaccount-id", "max-results", "ad-words-site", "approved", "campaign-ids"].iter().map(|v|*v)); + v.extend(["accepts-in-stream-video-placements", "accepts-interstitial-placements", "accepts-publisher-paid-placements", "ad-words-site", "approved", "campaign-ids", "directory-site-ids", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order", "subaccount-id", "unmapped-site"].iter().map(|v|*v)); v } )); } } @@ -15022,7 +15022,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["ids", "width", "height", "iab-standard"].iter().map(|v|*v)); + v.extend(["height", "iab-standard", "ids", "width"].iter().map(|v|*v)); v } )); } } @@ -15234,7 +15234,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "search-string", "sort-order", "ids", "sort-field", "max-results"].iter().map(|v|*v)); + v.extend(["ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -15535,7 +15535,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "active", "name", "sort-order", "sort-field", "max-results"].iter().map(|v|*v)); + v.extend(["active", "max-results", "name", "page-token", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -15763,7 +15763,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "search-string", "sort-order", "advertiser-id", "ids", "sort-field", "max-results"].iter().map(|v|*v)); + v.extend(["advertiser-id", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -16547,7 +16547,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "search-string", "sort-order", "ids", "sort-field", "subaccount-id", "max-results", "account-user-role-only"].iter().map(|v|*v)); + v.extend(["account-user-role-only", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order", "subaccount-id"].iter().map(|v|*v)); v } )); } } diff --git a/gen/dfareporting3d2/src/api.rs b/gen/dfareporting3d2/src/api.rs index cb9ecb5c50..e47cf771c1 100644 --- a/gen/dfareporting3d2/src/api.rs +++ b/gen/dfareporting3d2/src/api.rs @@ -14476,25 +14476,15 @@ impl<'a, C> AccountActiveAdSummaryGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14502,13 +14492,15 @@ impl<'a, C> AccountActiveAdSummaryGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14747,25 +14739,15 @@ impl<'a, C> AccountPermissionGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14773,13 +14755,15 @@ impl<'a, C> AccountPermissionGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15016,25 +15000,15 @@ impl<'a, C> AccountPermissionGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15042,13 +15016,15 @@ impl<'a, C> AccountPermissionGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15277,25 +15253,15 @@ impl<'a, C> AccountPermissionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15303,13 +15269,15 @@ impl<'a, C> AccountPermissionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15546,25 +15514,15 @@ impl<'a, C> AccountPermissionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15572,13 +15530,15 @@ impl<'a, C> AccountPermissionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15807,25 +15767,15 @@ impl<'a, C> AccountUserProfileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15833,13 +15783,15 @@ impl<'a, C> AccountUserProfileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16097,25 +16049,15 @@ impl<'a, C> AccountUserProfileInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16123,13 +16065,15 @@ impl<'a, C> AccountUserProfileInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16412,25 +16356,15 @@ impl<'a, C> AccountUserProfileListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16438,13 +16372,15 @@ impl<'a, C> AccountUserProfileListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16758,25 +16694,15 @@ impl<'a, C> AccountUserProfilePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16784,13 +16710,15 @@ impl<'a, C> AccountUserProfilePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17057,25 +16985,15 @@ impl<'a, C> AccountUserProfileUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17083,13 +17001,15 @@ impl<'a, C> AccountUserProfileUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17327,25 +17247,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17353,13 +17263,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17633,25 +17545,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17659,13 +17561,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17965,25 +17869,15 @@ impl<'a, C> AccountPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17991,13 +17885,15 @@ impl<'a, C> AccountPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18264,25 +18160,15 @@ impl<'a, C> AccountUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18290,13 +18176,15 @@ impl<'a, C> AccountUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18534,25 +18422,15 @@ impl<'a, C> AdGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18560,13 +18438,15 @@ impl<'a, C> AdGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18824,25 +18704,15 @@ impl<'a, C> AdInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18850,13 +18720,15 @@ impl<'a, C> AdInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19227,25 +19099,15 @@ impl<'a, C> AdListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19253,13 +19115,15 @@ impl<'a, C> AdListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19680,25 +19544,15 @@ impl<'a, C> AdPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19706,13 +19560,15 @@ impl<'a, C> AdPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19979,25 +19835,15 @@ impl<'a, C> AdUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20005,13 +19851,15 @@ impl<'a, C> AdUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20248,25 +20096,15 @@ impl<'a, C> AdvertiserGroupDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20274,11 +20112,11 @@ impl<'a, C> AdvertiserGroupDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -20511,25 +20349,15 @@ impl<'a, C> AdvertiserGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20537,13 +20365,15 @@ impl<'a, C> AdvertiserGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20801,25 +20631,15 @@ impl<'a, C> AdvertiserGroupInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20827,13 +20647,15 @@ impl<'a, C> AdvertiserGroupInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21101,25 +20923,15 @@ impl<'a, C> AdvertiserGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21127,13 +20939,15 @@ impl<'a, C> AdvertiserGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21426,25 +21240,15 @@ impl<'a, C> AdvertiserGroupPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21452,13 +21256,15 @@ impl<'a, C> AdvertiserGroupPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21725,25 +21531,15 @@ impl<'a, C> AdvertiserGroupUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21751,13 +21547,15 @@ impl<'a, C> AdvertiserGroupUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21995,25 +21793,15 @@ impl<'a, C> AdvertiserLandingPageGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22021,13 +21809,15 @@ impl<'a, C> AdvertiserLandingPageGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22285,25 +22075,15 @@ impl<'a, C> AdvertiserLandingPageInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22311,13 +22091,15 @@ impl<'a, C> AdvertiserLandingPageInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22609,25 +22391,15 @@ impl<'a, C> AdvertiserLandingPageListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22635,13 +22407,15 @@ impl<'a, C> AdvertiserLandingPageListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22964,25 +22738,15 @@ impl<'a, C> AdvertiserLandingPagePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22990,13 +22754,15 @@ impl<'a, C> AdvertiserLandingPagePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23263,25 +23029,15 @@ impl<'a, C> AdvertiserLandingPageUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23289,13 +23045,15 @@ impl<'a, C> AdvertiserLandingPageUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23533,25 +23291,15 @@ impl<'a, C> AdvertiserGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23559,13 +23307,15 @@ impl<'a, C> AdvertiserGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23823,25 +23573,15 @@ impl<'a, C> AdvertiserInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23849,13 +23589,15 @@ impl<'a, C> AdvertiserInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24157,25 +23899,15 @@ impl<'a, C> AdvertiserListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24183,13 +23915,15 @@ impl<'a, C> AdvertiserListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24526,25 +24260,15 @@ impl<'a, C> AdvertiserPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24552,13 +24276,15 @@ impl<'a, C> AdvertiserPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24825,25 +24551,15 @@ impl<'a, C> AdvertiserUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24851,13 +24567,15 @@ impl<'a, C> AdvertiserUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25093,25 +24811,15 @@ impl<'a, C> BrowserListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25119,13 +24827,15 @@ impl<'a, C> BrowserListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25375,25 +25085,15 @@ impl<'a, C> CampaignCreativeAssociationInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25401,13 +25101,15 @@ impl<'a, C> CampaignCreativeAssociationInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25670,25 +25372,15 @@ impl<'a, C> CampaignCreativeAssociationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25696,13 +25388,15 @@ impl<'a, C> CampaignCreativeAssociationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25962,25 +25656,15 @@ impl<'a, C> CampaignGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25988,13 +25672,15 @@ impl<'a, C> CampaignGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26252,25 +25938,15 @@ impl<'a, C> CampaignInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26278,13 +25954,15 @@ impl<'a, C> CampaignInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26593,25 +26271,15 @@ impl<'a, C> CampaignListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26619,13 +26287,15 @@ impl<'a, C> CampaignListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26970,25 +26640,15 @@ impl<'a, C> CampaignPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26996,13 +26656,15 @@ impl<'a, C> CampaignPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27269,25 +26931,15 @@ impl<'a, C> CampaignUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27295,13 +26947,15 @@ impl<'a, C> CampaignUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27539,25 +27193,15 @@ impl<'a, C> ChangeLogGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27565,13 +27209,15 @@ impl<'a, C> ChangeLogGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27864,25 +27510,15 @@ impl<'a, C> ChangeLogListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27890,13 +27526,15 @@ impl<'a, C> ChangeLogListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28222,25 +27860,15 @@ impl<'a, C> CityListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28248,13 +27876,15 @@ impl<'a, C> CityListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28514,25 +28144,15 @@ impl<'a, C> ConnectionTypeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28540,13 +28160,15 @@ impl<'a, C> ConnectionTypeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28783,25 +28405,15 @@ impl<'a, C> ConnectionTypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28809,13 +28421,15 @@ impl<'a, C> ConnectionTypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29043,25 +28657,15 @@ impl<'a, C> ContentCategoryDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29069,11 +28673,11 @@ impl<'a, C> ContentCategoryDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -29306,25 +28910,15 @@ impl<'a, C> ContentCategoryGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29332,13 +28926,15 @@ impl<'a, C> ContentCategoryGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29596,25 +29192,15 @@ impl<'a, C> ContentCategoryInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29622,13 +29208,15 @@ impl<'a, C> ContentCategoryInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29896,25 +29484,15 @@ impl<'a, C> ContentCategoryListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29922,13 +29500,15 @@ impl<'a, C> ContentCategoryListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30221,25 +29801,15 @@ impl<'a, C> ContentCategoryPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30247,13 +29817,15 @@ impl<'a, C> ContentCategoryPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30520,25 +30092,15 @@ impl<'a, C> ContentCategoryUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30546,13 +30108,15 @@ impl<'a, C> ContentCategoryUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30809,25 +30373,15 @@ impl<'a, C> ConversionBatchinsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30835,13 +30389,15 @@ impl<'a, C> ConversionBatchinsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31098,25 +30654,15 @@ impl<'a, C> ConversionBatchupdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31124,13 +30670,15 @@ impl<'a, C> ConversionBatchupdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31368,25 +30916,15 @@ impl<'a, C> CountryGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31394,13 +30932,15 @@ impl<'a, C> CountryGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31637,25 +31177,15 @@ impl<'a, C> CountryListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31663,13 +31193,15 @@ impl<'a, C> CountryListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31964,25 +31496,15 @@ impl<'a, C> CreativeAssetInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31990,7 +31512,7 @@ impl<'a, C> CreativeAssetInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -32002,7 +31524,7 @@ impl<'a, C> CreativeAssetInsertCall<'a, C> where C: BorrowMut CreativeAssetInsertCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32316,25 +31840,15 @@ impl<'a, C> CreativeFieldValueDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32342,11 +31856,11 @@ impl<'a, C> CreativeFieldValueDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -32591,25 +32105,15 @@ impl<'a, C> CreativeFieldValueGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32617,13 +32121,15 @@ impl<'a, C> CreativeFieldValueGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32893,25 +32399,15 @@ impl<'a, C> CreativeFieldValueInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32919,13 +32415,15 @@ impl<'a, C> CreativeFieldValueInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33205,25 +32703,15 @@ impl<'a, C> CreativeFieldValueListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33231,13 +32719,15 @@ impl<'a, C> CreativeFieldValueListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33542,25 +33032,15 @@ impl<'a, C> CreativeFieldValuePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33568,13 +33048,15 @@ impl<'a, C> CreativeFieldValuePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33853,25 +33335,15 @@ impl<'a, C> CreativeFieldValueUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33879,13 +33351,15 @@ impl<'a, C> CreativeFieldValueUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34132,25 +33606,15 @@ impl<'a, C> CreativeFieldDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34158,11 +33622,11 @@ impl<'a, C> CreativeFieldDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -34395,25 +33859,15 @@ impl<'a, C> CreativeFieldGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34421,13 +33875,15 @@ impl<'a, C> CreativeFieldGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34685,25 +34141,15 @@ impl<'a, C> CreativeFieldInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34711,13 +34157,15 @@ impl<'a, C> CreativeFieldInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34992,25 +34440,15 @@ impl<'a, C> CreativeFieldListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35018,13 +34456,15 @@ impl<'a, C> CreativeFieldListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35325,25 +34765,15 @@ impl<'a, C> CreativeFieldPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35351,13 +34781,15 @@ impl<'a, C> CreativeFieldPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35624,25 +35056,15 @@ impl<'a, C> CreativeFieldUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35650,13 +35072,15 @@ impl<'a, C> CreativeFieldUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35894,25 +35318,15 @@ impl<'a, C> CreativeGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35920,13 +35334,15 @@ impl<'a, C> CreativeGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36184,25 +35600,15 @@ impl<'a, C> CreativeGroupInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36210,13 +35616,15 @@ impl<'a, C> CreativeGroupInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36496,25 +35904,15 @@ impl<'a, C> CreativeGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36522,13 +35920,15 @@ impl<'a, C> CreativeGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36836,25 +36236,15 @@ impl<'a, C> CreativeGroupPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36862,13 +36252,15 @@ impl<'a, C> CreativeGroupPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37135,25 +36527,15 @@ impl<'a, C> CreativeGroupUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37161,13 +36543,15 @@ impl<'a, C> CreativeGroupUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37405,25 +36789,15 @@ impl<'a, C> CreativeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37431,13 +36805,15 @@ impl<'a, C> CreativeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37695,25 +37071,15 @@ impl<'a, C> CreativeInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37721,13 +37087,15 @@ impl<'a, C> CreativeInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38055,25 +37423,15 @@ impl<'a, C> CreativeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38081,13 +37439,15 @@ impl<'a, C> CreativeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38455,25 +37815,15 @@ impl<'a, C> CreativePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38481,13 +37831,15 @@ impl<'a, C> CreativePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38754,25 +38106,15 @@ impl<'a, C> CreativeUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38780,13 +38122,15 @@ impl<'a, C> CreativeUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39053,25 +38397,15 @@ impl<'a, C> DimensionValueQueryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39079,13 +38413,15 @@ impl<'a, C> DimensionValueQueryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39337,25 +38673,15 @@ impl<'a, C> DirectorySiteContactGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39363,13 +38689,15 @@ impl<'a, C> DirectorySiteContactGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39645,25 +38973,15 @@ impl<'a, C> DirectorySiteContactListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39671,13 +38989,15 @@ impl<'a, C> DirectorySiteContactListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39957,25 +39277,15 @@ impl<'a, C> DirectorySiteGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39983,13 +39293,15 @@ impl<'a, C> DirectorySiteGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40247,25 +39559,15 @@ impl<'a, C> DirectorySiteInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40273,13 +39575,15 @@ impl<'a, C> DirectorySiteInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40582,25 +39886,15 @@ impl<'a, C> DirectorySiteListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40608,13 +39902,15 @@ impl<'a, C> DirectorySiteListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40938,25 +40234,15 @@ impl<'a, C> DynamicTargetingKeyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40964,11 +40250,11 @@ impl<'a, C> DynamicTargetingKeyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -41240,25 +40526,15 @@ impl<'a, C> DynamicTargetingKeyInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41266,13 +40542,15 @@ impl<'a, C> DynamicTargetingKeyInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41530,25 +40808,15 @@ impl<'a, C> DynamicTargetingKeyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41556,13 +40824,15 @@ impl<'a, C> DynamicTargetingKeyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41819,25 +41089,15 @@ impl<'a, C> EventTagDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41845,11 +41105,11 @@ impl<'a, C> EventTagDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -42082,25 +41342,15 @@ impl<'a, C> EventTagGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42108,13 +41358,15 @@ impl<'a, C> EventTagGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42372,25 +41624,15 @@ impl<'a, C> EventTagInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42398,13 +41640,15 @@ impl<'a, C> EventTagInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42694,25 +41938,15 @@ impl<'a, C> EventTagListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42720,13 +41954,15 @@ impl<'a, C> EventTagListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43048,25 +42284,15 @@ impl<'a, C> EventTagPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43074,13 +42300,15 @@ impl<'a, C> EventTagPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43347,25 +42575,15 @@ impl<'a, C> EventTagUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43373,13 +42591,15 @@ impl<'a, C> EventTagUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43638,25 +42858,15 @@ impl<'a, C> FileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43664,19 +42874,21 @@ impl<'a, C> FileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = if enable_resource_parsing { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); } } - } else { (reconstructed_result, Default::default()) }; + } else { (res, Default::default()) }; dlg.finished(true); return Ok(result_value) @@ -43932,25 +43144,15 @@ impl<'a, C> FileListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43958,13 +43160,15 @@ impl<'a, C> FileListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44227,25 +43431,15 @@ impl<'a, C> FloodlightActivityDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44253,11 +43447,11 @@ impl<'a, C> FloodlightActivityDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -44493,25 +43687,15 @@ impl<'a, C> FloodlightActivityGeneratetagCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44519,13 +43703,15 @@ impl<'a, C> FloodlightActivityGeneratetagCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44761,25 +43947,15 @@ impl<'a, C> FloodlightActivityGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44787,13 +43963,15 @@ impl<'a, C> FloodlightActivityGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45051,25 +44229,15 @@ impl<'a, C> FloodlightActivityInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45077,13 +44245,15 @@ impl<'a, C> FloodlightActivityInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45388,25 +44558,15 @@ impl<'a, C> FloodlightActivityListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45414,13 +44574,15 @@ impl<'a, C> FloodlightActivityListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45763,25 +44925,15 @@ impl<'a, C> FloodlightActivityPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45789,13 +44941,15 @@ impl<'a, C> FloodlightActivityPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46062,25 +45216,15 @@ impl<'a, C> FloodlightActivityUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46088,13 +45232,15 @@ impl<'a, C> FloodlightActivityUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46332,25 +45478,15 @@ impl<'a, C> FloodlightActivityGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46358,13 +45494,15 @@ impl<'a, C> FloodlightActivityGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46622,25 +45760,15 @@ impl<'a, C> FloodlightActivityGroupInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46648,13 +45776,15 @@ impl<'a, C> FloodlightActivityGroupInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46937,25 +46067,15 @@ impl<'a, C> FloodlightActivityGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46963,13 +46083,15 @@ impl<'a, C> FloodlightActivityGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47283,25 +46405,15 @@ impl<'a, C> FloodlightActivityGroupPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47309,13 +46421,15 @@ impl<'a, C> FloodlightActivityGroupPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47582,25 +46696,15 @@ impl<'a, C> FloodlightActivityGroupUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47608,13 +46712,15 @@ impl<'a, C> FloodlightActivityGroupUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47852,25 +46958,15 @@ impl<'a, C> FloodlightConfigurationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47878,13 +46974,15 @@ impl<'a, C> FloodlightConfigurationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -48128,25 +47226,15 @@ impl<'a, C> FloodlightConfigurationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -48154,13 +47242,15 @@ impl<'a, C> FloodlightConfigurationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -48418,25 +47508,15 @@ impl<'a, C> FloodlightConfigurationPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -48444,13 +47524,15 @@ impl<'a, C> FloodlightConfigurationPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -48717,25 +47799,15 @@ impl<'a, C> FloodlightConfigurationUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -48743,13 +47815,15 @@ impl<'a, C> FloodlightConfigurationUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -48989,25 +48063,15 @@ impl<'a, C> InventoryItemGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -49015,13 +48079,15 @@ impl<'a, C> InventoryItemGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49321,25 +48387,15 @@ impl<'a, C> InventoryItemListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -49347,13 +48403,15 @@ impl<'a, C> InventoryItemListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49656,25 +48714,15 @@ impl<'a, C> LanguageListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -49682,13 +48730,15 @@ impl<'a, C> LanguageListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49915,25 +48965,15 @@ impl<'a, C> MetroListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -49941,13 +48981,15 @@ impl<'a, C> MetroListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -50176,25 +49218,15 @@ impl<'a, C> MobileAppGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -50202,13 +49234,15 @@ impl<'a, C> MobileAppGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -50474,25 +49508,15 @@ impl<'a, C> MobileAppListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -50500,13 +49524,15 @@ impl<'a, C> MobileAppListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -50772,25 +49798,15 @@ impl<'a, C> MobileCarrierGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -50798,13 +49814,15 @@ impl<'a, C> MobileCarrierGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51041,25 +50059,15 @@ impl<'a, C> MobileCarrierListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51067,13 +50075,15 @@ impl<'a, C> MobileCarrierListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51302,25 +50312,15 @@ impl<'a, C> OperatingSystemVersionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51328,13 +50328,15 @@ impl<'a, C> OperatingSystemVersionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51571,25 +50573,15 @@ impl<'a, C> OperatingSystemVersionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51597,13 +50589,15 @@ impl<'a, C> OperatingSystemVersionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51832,25 +50826,15 @@ impl<'a, C> OperatingSystemGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51858,13 +50842,15 @@ impl<'a, C> OperatingSystemGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -52101,25 +51087,15 @@ impl<'a, C> OperatingSystemListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -52127,13 +51103,15 @@ impl<'a, C> OperatingSystemListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -52364,25 +51342,15 @@ impl<'a, C> OrderDocumentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -52390,13 +51358,15 @@ impl<'a, C> OrderDocumentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -52696,25 +51666,15 @@ impl<'a, C> OrderDocumentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -52722,13 +51682,15 @@ impl<'a, C> OrderDocumentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -53035,25 +51997,15 @@ impl<'a, C> OrderGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -53061,13 +52013,15 @@ impl<'a, C> OrderGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -53355,25 +52309,15 @@ impl<'a, C> OrderListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -53381,13 +52325,15 @@ impl<'a, C> OrderListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -53677,25 +52623,15 @@ impl<'a, C> PlacementGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -53703,13 +52639,15 @@ impl<'a, C> PlacementGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -53967,25 +52905,15 @@ impl<'a, C> PlacementGroupInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -53993,13 +52921,15 @@ impl<'a, C> PlacementGroupInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -54346,25 +53276,15 @@ impl<'a, C> PlacementGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -54372,13 +53292,15 @@ impl<'a, C> PlacementGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -54769,25 +53691,15 @@ impl<'a, C> PlacementGroupPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -54795,13 +53707,15 @@ impl<'a, C> PlacementGroupPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -55068,25 +53982,15 @@ impl<'a, C> PlacementGroupUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -55094,13 +53998,15 @@ impl<'a, C> PlacementGroupUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -55337,25 +54243,15 @@ impl<'a, C> PlacementStrategyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -55363,11 +54259,11 @@ impl<'a, C> PlacementStrategyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -55600,25 +54496,15 @@ impl<'a, C> PlacementStrategyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -55626,13 +54512,15 @@ impl<'a, C> PlacementStrategyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -55890,25 +54778,15 @@ impl<'a, C> PlacementStrategyInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -55916,13 +54794,15 @@ impl<'a, C> PlacementStrategyInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -56190,25 +55070,15 @@ impl<'a, C> PlacementStrategyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -56216,13 +55086,15 @@ impl<'a, C> PlacementStrategyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -56515,25 +55387,15 @@ impl<'a, C> PlacementStrategyPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -56541,13 +55403,15 @@ impl<'a, C> PlacementStrategyPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -56814,25 +55678,15 @@ impl<'a, C> PlacementStrategyUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -56840,13 +55694,15 @@ impl<'a, C> PlacementStrategyUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -57101,25 +55957,15 @@ impl<'a, C> PlacementGeneratetagCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -57127,13 +55973,15 @@ impl<'a, C> PlacementGeneratetagCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -57387,25 +56235,15 @@ impl<'a, C> PlacementGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -57413,13 +56251,15 @@ impl<'a, C> PlacementGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -57677,25 +56517,15 @@ impl<'a, C> PlacementInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -57703,13 +56533,15 @@ impl<'a, C> PlacementInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -58077,25 +56909,15 @@ impl<'a, C> PlacementListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -58103,13 +56925,15 @@ impl<'a, C> PlacementListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -58524,25 +57348,15 @@ impl<'a, C> PlacementPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -58550,13 +57364,15 @@ impl<'a, C> PlacementPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -58823,25 +57639,15 @@ impl<'a, C> PlacementUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -58849,13 +57655,15 @@ impl<'a, C> PlacementUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -59093,25 +57901,15 @@ impl<'a, C> PlatformTypeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -59119,13 +57917,15 @@ impl<'a, C> PlatformTypeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -59362,25 +58162,15 @@ impl<'a, C> PlatformTypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -59388,13 +58178,15 @@ impl<'a, C> PlatformTypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -59623,25 +58415,15 @@ impl<'a, C> PostalCodeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -59649,13 +58431,15 @@ impl<'a, C> PostalCodeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -59892,25 +58676,15 @@ impl<'a, C> PostalCodeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -59918,13 +58692,15 @@ impl<'a, C> PostalCodeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -60153,25 +58929,15 @@ impl<'a, C> ProjectGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -60179,13 +58945,15 @@ impl<'a, C> ProjectGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -60461,25 +59229,15 @@ impl<'a, C> ProjectListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -60487,13 +59245,15 @@ impl<'a, C> ProjectListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -60771,25 +59531,15 @@ impl<'a, C> RegionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -60797,13 +59547,15 @@ impl<'a, C> RegionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -61032,25 +59784,15 @@ impl<'a, C> RemarketingListShareGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -61058,13 +59800,15 @@ impl<'a, C> RemarketingListShareGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -61324,25 +60068,15 @@ impl<'a, C> RemarketingListSharePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -61350,13 +60084,15 @@ impl<'a, C> RemarketingListSharePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -61623,25 +60359,15 @@ impl<'a, C> RemarketingListShareUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -61649,13 +60375,15 @@ impl<'a, C> RemarketingListShareUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -61893,25 +60621,15 @@ impl<'a, C> RemarketingListGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -61919,13 +60637,15 @@ impl<'a, C> RemarketingListGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -62183,25 +60903,15 @@ impl<'a, C> RemarketingListInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -62209,13 +60919,15 @@ impl<'a, C> RemarketingListInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -62488,25 +61200,15 @@ impl<'a, C> RemarketingListListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -62514,13 +61216,15 @@ impl<'a, C> RemarketingListListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -62829,25 +61533,15 @@ impl<'a, C> RemarketingListPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -62855,13 +61549,15 @@ impl<'a, C> RemarketingListPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -63128,25 +61824,15 @@ impl<'a, C> RemarketingListUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -63154,13 +61840,15 @@ impl<'a, C> RemarketingListUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -63417,25 +62105,15 @@ impl<'a, C> ReportCompatibleFieldQueryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -63443,13 +62121,15 @@ impl<'a, C> ReportCompatibleFieldQueryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -63710,25 +62390,15 @@ impl<'a, C> ReportFileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -63736,19 +62406,21 @@ impl<'a, C> ReportFileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = if enable_resource_parsing { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); } } - } else { (reconstructed_result, Default::default()) }; + } else { (res, Default::default()) }; dlg.finished(true); return Ok(result_value) @@ -64011,25 +62683,15 @@ impl<'a, C> ReportFileListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -64037,13 +62699,15 @@ impl<'a, C> ReportFileListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -64309,25 +62973,15 @@ impl<'a, C> ReportDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -64335,11 +62989,11 @@ impl<'a, C> ReportDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -64572,25 +63226,15 @@ impl<'a, C> ReportGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -64598,13 +63242,15 @@ impl<'a, C> ReportGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -64862,25 +63508,15 @@ impl<'a, C> ReportInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -64888,13 +63524,15 @@ impl<'a, C> ReportInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -65155,25 +63793,15 @@ impl<'a, C> ReportListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -65181,13 +63809,15 @@ impl<'a, C> ReportListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -65472,25 +64102,15 @@ impl<'a, C> ReportPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -65498,13 +64118,15 @@ impl<'a, C> ReportPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -65757,25 +64379,15 @@ impl<'a, C> ReportRunCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -65783,13 +64395,15 @@ impl<'a, C> ReportRunCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -66056,25 +64670,15 @@ impl<'a, C> ReportUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -66082,13 +64686,15 @@ impl<'a, C> ReportUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -66336,25 +64942,15 @@ impl<'a, C> SiteGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -66362,13 +64958,15 @@ impl<'a, C> SiteGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -66626,25 +65224,15 @@ impl<'a, C> SiteInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -66652,13 +65240,15 @@ impl<'a, C> SiteInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -66975,25 +65565,15 @@ impl<'a, C> SiteListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -67001,13 +65581,15 @@ impl<'a, C> SiteListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -67365,25 +65947,15 @@ impl<'a, C> SitePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -67391,13 +65963,15 @@ impl<'a, C> SitePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -67664,25 +66238,15 @@ impl<'a, C> SiteUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -67690,13 +66254,15 @@ impl<'a, C> SiteUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -67934,25 +66500,15 @@ impl<'a, C> SizeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -67960,13 +66516,15 @@ impl<'a, C> SizeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -68224,25 +66782,15 @@ impl<'a, C> SizeInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -68250,13 +66798,15 @@ impl<'a, C> SizeInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -68514,25 +67064,15 @@ impl<'a, C> SizeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -68540,13 +67080,15 @@ impl<'a, C> SizeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -68804,25 +67346,15 @@ impl<'a, C> SubaccountGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -68830,13 +67362,15 @@ impl<'a, C> SubaccountGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -69094,25 +67628,15 @@ impl<'a, C> SubaccountInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -69120,13 +67644,15 @@ impl<'a, C> SubaccountInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -69394,25 +67920,15 @@ impl<'a, C> SubaccountListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -69420,13 +67936,15 @@ impl<'a, C> SubaccountListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -69719,25 +68237,15 @@ impl<'a, C> SubaccountPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -69745,13 +68253,15 @@ impl<'a, C> SubaccountPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -70018,25 +68528,15 @@ impl<'a, C> SubaccountUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -70044,13 +68544,15 @@ impl<'a, C> SubaccountUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -70288,25 +68790,15 @@ impl<'a, C> TargetableRemarketingListGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -70314,13 +68806,15 @@ impl<'a, C> TargetableRemarketingListGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -70589,25 +69083,15 @@ impl<'a, C> TargetableRemarketingListListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -70615,13 +69099,15 @@ impl<'a, C> TargetableRemarketingListListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -70902,25 +69388,15 @@ impl<'a, C> TargetingTemplateGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -70928,13 +69404,15 @@ impl<'a, C> TargetingTemplateGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -71192,25 +69670,15 @@ impl<'a, C> TargetingTemplateInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -71218,13 +69686,15 @@ impl<'a, C> TargetingTemplateInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -71497,25 +69967,15 @@ impl<'a, C> TargetingTemplateListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -71523,13 +69983,15 @@ impl<'a, C> TargetingTemplateListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -71829,25 +70291,15 @@ impl<'a, C> TargetingTemplatePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -71855,13 +70307,15 @@ impl<'a, C> TargetingTemplatePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -72128,25 +70582,15 @@ impl<'a, C> TargetingTemplateUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -72154,13 +70598,15 @@ impl<'a, C> TargetingTemplateUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -72396,25 +70842,15 @@ impl<'a, C> UserProfileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -72422,13 +70858,15 @@ impl<'a, C> UserProfileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -72632,25 +71070,15 @@ impl<'a, C> UserProfileListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -72658,13 +71086,15 @@ impl<'a, C> UserProfileListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -72883,25 +71313,15 @@ impl<'a, C> UserRolePermissionGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -72909,13 +71329,15 @@ impl<'a, C> UserRolePermissionGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -73152,25 +71574,15 @@ impl<'a, C> UserRolePermissionGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -73178,13 +71590,15 @@ impl<'a, C> UserRolePermissionGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -73413,25 +71827,15 @@ impl<'a, C> UserRolePermissionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -73439,13 +71843,15 @@ impl<'a, C> UserRolePermissionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -73689,25 +72095,15 @@ impl<'a, C> UserRolePermissionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -73715,13 +72111,15 @@ impl<'a, C> UserRolePermissionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -73957,25 +72355,15 @@ impl<'a, C> UserRoleDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -73983,11 +72371,11 @@ impl<'a, C> UserRoleDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -74220,25 +72608,15 @@ impl<'a, C> UserRoleGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -74246,13 +72624,15 @@ impl<'a, C> UserRoleGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -74510,25 +72890,15 @@ impl<'a, C> UserRoleInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -74536,13 +72906,15 @@ impl<'a, C> UserRoleInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -74820,25 +73192,15 @@ impl<'a, C> UserRoleListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -74846,13 +73208,15 @@ impl<'a, C> UserRoleListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -75159,25 +73523,15 @@ impl<'a, C> UserRolePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -75185,13 +73539,15 @@ impl<'a, C> UserRolePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -75458,25 +73814,15 @@ impl<'a, C> UserRoleUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -75484,13 +73830,15 @@ impl<'a, C> UserRoleUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -75728,25 +74076,15 @@ impl<'a, C> VideoFormatGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -75754,13 +74092,15 @@ impl<'a, C> VideoFormatGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -75997,25 +74337,15 @@ impl<'a, C> VideoFormatListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -76023,13 +74353,15 @@ impl<'a, C> VideoFormatListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/dfareporting3d2/src/client.rs b/gen/dfareporting3d2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/dfareporting3d2/src/client.rs +++ b/gen/dfareporting3d2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/dfareporting3d3-cli/src/main.rs b/gen/dfareporting3d3-cli/src/main.rs index ecb1d42e55..45e6c5d7e6 100644 --- a/gen/dfareporting3d3-cli/src/main.rs +++ b/gen/dfareporting3d3-cli/src/main.rs @@ -508,7 +508,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-order", "page-token", "sort-field", "subaccount-id", "ids", "max-results", "user-role-id", "active", "search-string"].iter().map(|v|*v)); + v.extend(["active", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order", "subaccount-id", "user-role-id"].iter().map(|v|*v)); v } )); } } @@ -850,7 +850,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-order", "page-token", "sort-field", "ids", "max-results", "active", "search-string"].iter().map(|v|*v)); + v.extend(["active", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -1386,7 +1386,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "campaign-ids", "max-results", "advertiser-id", "type", "ssl-compliant", "sort-order", "dynamic-click-tracker", "size-ids", "search-string", "compatibility", "ssl-required", "overridden-event-tag-id", "placement-ids", "sort-field", "ids", "creative-optimization-configuration-ids", "archived", "landing-page-ids", "audience-segment-ids", "active", "remarketing-list-ids", "creative-ids"].iter().map(|v|*v)); + v.extend(["active", "advertiser-id", "archived", "audience-segment-ids", "campaign-ids", "compatibility", "creative-ids", "creative-optimization-configuration-ids", "dynamic-click-tracker", "ids", "landing-page-ids", "max-results", "overridden-event-tag-id", "page-token", "placement-ids", "remarketing-list-ids", "search-string", "size-ids", "sort-field", "sort-order", "ssl-compliant", "ssl-required", "type"].iter().map(|v|*v)); v } )); } } @@ -1941,7 +1941,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-order", "page-token", "sort-field", "ids", "max-results", "search-string"].iter().map(|v|*v)); + v.extend(["ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -2342,7 +2342,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-order", "page-token", "campaign-ids", "sort-field", "subaccount-id", "ids", "max-results", "advertiser-ids", "archived", "search-string"].iter().map(|v|*v)); + v.extend(["advertiser-ids", "archived", "campaign-ids", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order", "subaccount-id"].iter().map(|v|*v)); v } )); } } @@ -2772,7 +2772,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-order", "page-token", "sort-field", "subaccount-id", "include-advertisers-without-groups-only", "max-results", "ids", "only-parent", "search-string", "advertiser-group-ids", "status", "floodlight-configuration-ids"].iter().map(|v|*v)); + v.extend(["advertiser-group-ids", "floodlight-configuration-ids", "ids", "include-advertisers-without-groups-only", "max-results", "only-parent", "page-token", "search-string", "sort-field", "sort-order", "status", "subaccount-id"].iter().map(|v|*v)); v } )); } } @@ -3190,7 +3190,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-order", "max-results", "page-token"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -3460,7 +3460,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-order", "overridden-event-tag-id", "page-token", "advertiser-group-ids", "sort-field", "subaccount-id", "ids", "max-results", "advertiser-ids", "archived", "search-string", "excluded-ids", "at-least-one-optimization-activity"].iter().map(|v|*v)); + v.extend(["advertiser-group-ids", "advertiser-ids", "archived", "at-least-one-optimization-activity", "excluded-ids", "ids", "max-results", "overridden-event-tag-id", "page-token", "search-string", "sort-field", "sort-order", "subaccount-id"].iter().map(|v|*v)); v } )); } } @@ -3847,7 +3847,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "object-ids", "ids", "user-profile-ids", "max-results", "min-change-time", "search-string", "action", "object-type", "max-change-time"].iter().map(|v|*v)); + v.extend(["action", "ids", "max-change-time", "max-results", "min-change-time", "object-ids", "object-type", "page-token", "search-string", "user-profile-ids"].iter().map(|v|*v)); v } )); } } @@ -3912,7 +3912,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["region-dart-ids", "country-dart-ids", "name-prefix", "dart-ids"].iter().map(|v|*v)); + v.extend(["country-dart-ids", "dart-ids", "name-prefix", "region-dart-ids"].iter().map(|v|*v)); v } )); } } @@ -4271,7 +4271,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-order", "page-token", "sort-field", "ids", "max-results", "search-string"].iter().map(|v|*v)); + v.extend(["ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -5082,7 +5082,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-order", "page-token", "sort-field", "ids", "max-results", "search-string"].iter().map(|v|*v)); + v.extend(["ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -5522,7 +5522,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-order", "page-token", "sort-field", "ids", "max-results", "advertiser-ids", "search-string"].iter().map(|v|*v)); + v.extend(["advertiser-ids", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -5940,7 +5940,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-order", "page-token", "group-number", "sort-field", "ids", "max-results", "advertiser-ids", "search-string"].iter().map(|v|*v)); + v.extend(["advertiser-ids", "group-number", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -6451,7 +6451,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-order", "page-token", "sort-field", "ids", "max-results", "advertiser-id", "archived", "size-ids", "search-string", "rendering-ids", "companion-creative-ids", "studio-creative-id", "creative-field-ids", "campaign-id", "types", "active"].iter().map(|v|*v)); + v.extend(["active", "advertiser-id", "archived", "campaign-id", "companion-creative-ids", "creative-field-ids", "ids", "max-results", "page-token", "rendering-ids", "search-string", "size-ids", "sort-field", "sort-order", "studio-creative-id", "types"].iter().map(|v|*v)); v } )); } } @@ -7117,7 +7117,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-order", "page-token", "sort-field", "ids", "max-results", "active", "search-string", "accepts-publisher-paid-placements", "accepts-interstitial-placements", "dfp-network-code", "accepts-in-stream-video-placements"].iter().map(|v|*v)); + v.extend(["accepts-in-stream-video-placements", "accepts-interstitial-placements", "accepts-publisher-paid-placements", "active", "dfp-network-code", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -7314,7 +7314,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["object-type", "object-id", "advertiser-id", "names"].iter().map(|v|*v)); + v.extend(["advertiser-id", "names", "object-id", "object-type"].iter().map(|v|*v)); v } )); } } @@ -7605,7 +7605,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-order", "sort-field", "enabled", "ids", "advertiser-id", "search-string", "campaign-id", "definitions-only", "ad-id", "event-tag-types"].iter().map(|v|*v)); + v.extend(["ad-id", "advertiser-id", "campaign-id", "definitions-only", "enabled", "event-tag-types", "ids", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -7959,7 +7959,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-order", "page-token", "sort-field", "max-results", "scope"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "scope", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -8328,7 +8328,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-order", "page-token", "sort-field", "tag-string", "max-results", "ids", "advertiser-id", "floodlight-activity-group-ids", "floodlight-activity-group-name", "search-string", "floodlight-activity-group-tag-string", "floodlight-activity-group-type", "floodlight-configuration-id"].iter().map(|v|*v)); + v.extend(["advertiser-id", "floodlight-activity-group-ids", "floodlight-activity-group-name", "floodlight-activity-group-tag-string", "floodlight-activity-group-type", "floodlight-configuration-id", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order", "tag-string"].iter().map(|v|*v)); v } )); } } @@ -8821,7 +8821,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-order", "page-token", "sort-field", "ids", "max-results", "advertiser-id", "type", "search-string", "floodlight-configuration-id"].iter().map(|v|*v)); + v.extend(["advertiser-id", "floodlight-configuration-id", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order", "type"].iter().map(|v|*v)); v } )); } } @@ -9519,7 +9519,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-order", "site-id", "page-token", "sort-field", "ids", "max-results", "type", "order-id", "in-plan"].iter().map(|v|*v)); + v.extend(["ids", "in-plan", "max-results", "order-id", "page-token", "site-id", "sort-field", "sort-order", "type"].iter().map(|v|*v)); v } )); } } @@ -9743,7 +9743,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "ids", "max-results", "search-string", "directories"].iter().map(|v|*v)); + v.extend(["directories", "ids", "max-results", "page-token", "search-string"].iter().map(|v|*v)); v } )); } } @@ -10187,7 +10187,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-order", "site-id", "page-token", "sort-field", "ids", "max-results", "search-string", "order-id", "approved"].iter().map(|v|*v)); + v.extend(["approved", "ids", "max-results", "order-id", "page-token", "search-string", "site-id", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -10313,7 +10313,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-order", "site-id", "page-token", "sort-field", "ids", "max-results", "search-string"].iter().map(|v|*v)); + v.extend(["ids", "max-results", "page-token", "search-string", "site-id", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -10622,7 +10622,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "campaign-ids", "placement-strategy-ids", "max-results", "max-start-date", "sort-order", "pricing-types", "search-string", "site-ids", "placement-group-type", "sort-field", "directory-site-ids", "ids", "content-category-ids", "max-end-date", "advertiser-ids", "archived", "min-end-date", "min-start-date"].iter().map(|v|*v)); + v.extend(["advertiser-ids", "archived", "campaign-ids", "content-category-ids", "directory-site-ids", "ids", "max-end-date", "max-results", "max-start-date", "min-end-date", "min-start-date", "page-token", "placement-group-type", "placement-strategy-ids", "pricing-types", "search-string", "site-ids", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -11171,7 +11171,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-order", "page-token", "sort-field", "ids", "max-results", "search-string"].iter().map(|v|*v)); + v.extend(["ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -11409,7 +11409,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["tag-formats", "placement-ids", "campaign-id"].iter().map(|v|*v)); + v.extend(["campaign-id", "placement-ids", "tag-formats"].iter().map(|v|*v)); v } )); } } @@ -11761,7 +11761,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "campaign-ids", "placement-strategy-ids", "max-results", "max-start-date", "sort-order", "size-ids", "search-string", "pricing-types", "site-ids", "group-ids", "compatibilities", "sort-field", "directory-site-ids", "ids", "content-category-ids", "max-end-date", "advertiser-ids", "archived", "min-end-date", "payment-source", "min-start-date"].iter().map(|v|*v)); + v.extend(["advertiser-ids", "archived", "campaign-ids", "compatibilities", "content-category-ids", "directory-site-ids", "group-ids", "ids", "max-end-date", "max-results", "max-start-date", "min-end-date", "min-start-date", "page-token", "payment-source", "placement-strategy-ids", "pricing-types", "search-string", "site-ids", "size-ids", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -12457,7 +12457,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-order", "page-token", "sort-field", "ids", "max-results", "advertiser-ids", "search-string"].iter().map(|v|*v)); + v.extend(["advertiser-ids", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -12966,7 +12966,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-order", "name", "page-token", "sort-field", "max-results", "floodlight-activity-id", "active"].iter().map(|v|*v)); + v.extend(["active", "floodlight-activity-id", "max-results", "name", "page-token", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -13508,7 +13508,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-order", "max-results", "page-token", "sort-field"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -13793,7 +13793,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-order", "page-token", "sort-field", "max-results", "scope"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "scope", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -14455,7 +14455,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-order", "page-token", "campaign-ids", "sort-field", "subaccount-id", "ids", "max-results", "directory-site-ids", "ad-words-site", "unmapped-site", "search-string", "accepts-publisher-paid-placements", "accepts-interstitial-placements", "approved", "accepts-in-stream-video-placements"].iter().map(|v|*v)); + v.extend(["accepts-in-stream-video-placements", "accepts-interstitial-placements", "accepts-publisher-paid-placements", "ad-words-site", "approved", "campaign-ids", "directory-site-ids", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order", "subaccount-id", "unmapped-site"].iter().map(|v|*v)); v } )); } } @@ -15125,7 +15125,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-order", "page-token", "sort-field", "ids", "max-results", "search-string"].iter().map(|v|*v)); + v.extend(["ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -15426,7 +15426,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-order", "name", "page-token", "sort-field", "max-results", "active"].iter().map(|v|*v)); + v.extend(["active", "max-results", "name", "page-token", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -15654,7 +15654,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-order", "page-token", "sort-field", "ids", "max-results", "advertiser-id", "search-string"].iter().map(|v|*v)); + v.extend(["advertiser-id", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -16438,7 +16438,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-order", "page-token", "sort-field", "subaccount-id", "ids", "max-results", "search-string", "account-user-role-only"].iter().map(|v|*v)); + v.extend(["account-user-role-only", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order", "subaccount-id"].iter().map(|v|*v)); v } )); } } diff --git a/gen/dfareporting3d3/src/api.rs b/gen/dfareporting3d3/src/api.rs index 367a245a99..d76d0e8d84 100644 --- a/gen/dfareporting3d3/src/api.rs +++ b/gen/dfareporting3d3/src/api.rs @@ -14129,25 +14129,15 @@ impl<'a, C> AccountActiveAdSummaryGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14155,13 +14145,15 @@ impl<'a, C> AccountActiveAdSummaryGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14404,25 +14396,15 @@ impl<'a, C> AccountPermissionGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14430,13 +14412,15 @@ impl<'a, C> AccountPermissionGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14677,25 +14661,15 @@ impl<'a, C> AccountPermissionGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14703,13 +14677,15 @@ impl<'a, C> AccountPermissionGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14942,25 +14918,15 @@ impl<'a, C> AccountPermissionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14968,13 +14934,15 @@ impl<'a, C> AccountPermissionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15215,25 +15183,15 @@ impl<'a, C> AccountPermissionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15241,13 +15199,15 @@ impl<'a, C> AccountPermissionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15480,25 +15440,15 @@ impl<'a, C> AccountUserProfileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15506,13 +15456,15 @@ impl<'a, C> AccountUserProfileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15774,25 +15726,15 @@ impl<'a, C> AccountUserProfileInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15800,13 +15742,15 @@ impl<'a, C> AccountUserProfileInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16093,25 +16037,15 @@ impl<'a, C> AccountUserProfileListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16119,13 +16053,15 @@ impl<'a, C> AccountUserProfileListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16443,25 +16379,15 @@ impl<'a, C> AccountUserProfilePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16469,13 +16395,15 @@ impl<'a, C> AccountUserProfilePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16746,25 +16674,15 @@ impl<'a, C> AccountUserProfileUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16772,13 +16690,15 @@ impl<'a, C> AccountUserProfileUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17020,25 +16940,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17046,13 +16956,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17330,25 +17242,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17356,13 +17258,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17666,25 +17570,15 @@ impl<'a, C> AccountPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17692,13 +17586,15 @@ impl<'a, C> AccountPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17969,25 +17865,15 @@ impl<'a, C> AccountUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17995,13 +17881,15 @@ impl<'a, C> AccountUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18243,25 +18131,15 @@ impl<'a, C> AdGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18269,13 +18147,15 @@ impl<'a, C> AdGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18537,25 +18417,15 @@ impl<'a, C> AdInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18563,13 +18433,15 @@ impl<'a, C> AdInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18944,25 +18816,15 @@ impl<'a, C> AdListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18970,13 +18832,15 @@ impl<'a, C> AdListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19401,25 +19265,15 @@ impl<'a, C> AdPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19427,13 +19281,15 @@ impl<'a, C> AdPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19704,25 +19560,15 @@ impl<'a, C> AdUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19730,13 +19576,15 @@ impl<'a, C> AdUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19977,25 +19825,15 @@ impl<'a, C> AdvertiserGroupDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20003,11 +19841,11 @@ impl<'a, C> AdvertiserGroupDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -20244,25 +20082,15 @@ impl<'a, C> AdvertiserGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20270,13 +20098,15 @@ impl<'a, C> AdvertiserGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20538,25 +20368,15 @@ impl<'a, C> AdvertiserGroupInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20564,13 +20384,15 @@ impl<'a, C> AdvertiserGroupInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20842,25 +20664,15 @@ impl<'a, C> AdvertiserGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20868,13 +20680,15 @@ impl<'a, C> AdvertiserGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21171,25 +20985,15 @@ impl<'a, C> AdvertiserGroupPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21197,13 +21001,15 @@ impl<'a, C> AdvertiserGroupPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21474,25 +21280,15 @@ impl<'a, C> AdvertiserGroupUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21500,13 +21296,15 @@ impl<'a, C> AdvertiserGroupUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21748,25 +21546,15 @@ impl<'a, C> AdvertiserLandingPageGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21774,13 +21562,15 @@ impl<'a, C> AdvertiserLandingPageGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22042,25 +21832,15 @@ impl<'a, C> AdvertiserLandingPageInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22068,13 +21848,15 @@ impl<'a, C> AdvertiserLandingPageInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22370,25 +22152,15 @@ impl<'a, C> AdvertiserLandingPageListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22396,13 +22168,15 @@ impl<'a, C> AdvertiserLandingPageListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22729,25 +22503,15 @@ impl<'a, C> AdvertiserLandingPagePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22755,13 +22519,15 @@ impl<'a, C> AdvertiserLandingPagePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23032,25 +22798,15 @@ impl<'a, C> AdvertiserLandingPageUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23058,13 +22814,15 @@ impl<'a, C> AdvertiserLandingPageUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23306,25 +23064,15 @@ impl<'a, C> AdvertiserGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23332,13 +23080,15 @@ impl<'a, C> AdvertiserGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23600,25 +23350,15 @@ impl<'a, C> AdvertiserInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23626,13 +23366,15 @@ impl<'a, C> AdvertiserInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23938,25 +23680,15 @@ impl<'a, C> AdvertiserListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23964,13 +23696,15 @@ impl<'a, C> AdvertiserListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24311,25 +24045,15 @@ impl<'a, C> AdvertiserPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24337,13 +24061,15 @@ impl<'a, C> AdvertiserPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24614,25 +24340,15 @@ impl<'a, C> AdvertiserUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24640,13 +24356,15 @@ impl<'a, C> AdvertiserUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24886,25 +24604,15 @@ impl<'a, C> BrowserListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24912,13 +24620,15 @@ impl<'a, C> BrowserListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25172,25 +24882,15 @@ impl<'a, C> CampaignCreativeAssociationInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25198,13 +24898,15 @@ impl<'a, C> CampaignCreativeAssociationInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25471,25 +25173,15 @@ impl<'a, C> CampaignCreativeAssociationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25497,13 +25189,15 @@ impl<'a, C> CampaignCreativeAssociationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25767,25 +25461,15 @@ impl<'a, C> CampaignGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25793,13 +25477,15 @@ impl<'a, C> CampaignGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26061,25 +25747,15 @@ impl<'a, C> CampaignInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26087,13 +25763,15 @@ impl<'a, C> CampaignInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26406,25 +26084,15 @@ impl<'a, C> CampaignListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26432,13 +26100,15 @@ impl<'a, C> CampaignListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26787,25 +26457,15 @@ impl<'a, C> CampaignPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26813,13 +26473,15 @@ impl<'a, C> CampaignPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27090,25 +26752,15 @@ impl<'a, C> CampaignUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27116,13 +26768,15 @@ impl<'a, C> CampaignUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27364,25 +27018,15 @@ impl<'a, C> ChangeLogGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27390,13 +27034,15 @@ impl<'a, C> ChangeLogGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27693,25 +27339,15 @@ impl<'a, C> ChangeLogListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27719,13 +27355,15 @@ impl<'a, C> ChangeLogListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28055,25 +27693,15 @@ impl<'a, C> CityListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28081,13 +27709,15 @@ impl<'a, C> CityListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28351,25 +27981,15 @@ impl<'a, C> ConnectionTypeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28377,13 +27997,15 @@ impl<'a, C> ConnectionTypeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28624,25 +28246,15 @@ impl<'a, C> ConnectionTypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28650,13 +28262,15 @@ impl<'a, C> ConnectionTypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28888,25 +28502,15 @@ impl<'a, C> ContentCategoryDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28914,11 +28518,11 @@ impl<'a, C> ContentCategoryDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -29155,25 +28759,15 @@ impl<'a, C> ContentCategoryGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29181,13 +28775,15 @@ impl<'a, C> ContentCategoryGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29449,25 +29045,15 @@ impl<'a, C> ContentCategoryInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29475,13 +29061,15 @@ impl<'a, C> ContentCategoryInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29753,25 +29341,15 @@ impl<'a, C> ContentCategoryListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29779,13 +29357,15 @@ impl<'a, C> ContentCategoryListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30082,25 +29662,15 @@ impl<'a, C> ContentCategoryPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30108,13 +29678,15 @@ impl<'a, C> ContentCategoryPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30385,25 +29957,15 @@ impl<'a, C> ContentCategoryUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30411,13 +29973,15 @@ impl<'a, C> ContentCategoryUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30678,25 +30242,15 @@ impl<'a, C> ConversionBatchinsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30704,13 +30258,15 @@ impl<'a, C> ConversionBatchinsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30971,25 +30527,15 @@ impl<'a, C> ConversionBatchupdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30997,13 +30543,15 @@ impl<'a, C> ConversionBatchupdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31245,25 +30793,15 @@ impl<'a, C> CountryGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31271,13 +30809,15 @@ impl<'a, C> CountryGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31518,25 +31058,15 @@ impl<'a, C> CountryListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31544,13 +31074,15 @@ impl<'a, C> CountryListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31829,25 +31361,15 @@ impl<'a, C> CreativeAssetInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31855,13 +31377,15 @@ impl<'a, C> CreativeAssetInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32124,25 +31648,15 @@ impl<'a, C> CreativeFieldValueDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32150,11 +31664,11 @@ impl<'a, C> CreativeFieldValueDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -32403,25 +31917,15 @@ impl<'a, C> CreativeFieldValueGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32429,13 +31933,15 @@ impl<'a, C> CreativeFieldValueGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32709,25 +32215,15 @@ impl<'a, C> CreativeFieldValueInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32735,13 +32231,15 @@ impl<'a, C> CreativeFieldValueInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33025,25 +32523,15 @@ impl<'a, C> CreativeFieldValueListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33051,13 +32539,15 @@ impl<'a, C> CreativeFieldValueListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33366,25 +32856,15 @@ impl<'a, C> CreativeFieldValuePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33392,13 +32872,15 @@ impl<'a, C> CreativeFieldValuePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33681,25 +33163,15 @@ impl<'a, C> CreativeFieldValueUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33707,13 +33179,15 @@ impl<'a, C> CreativeFieldValueUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33964,25 +33438,15 @@ impl<'a, C> CreativeFieldDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33990,11 +33454,11 @@ impl<'a, C> CreativeFieldDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -34231,25 +33695,15 @@ impl<'a, C> CreativeFieldGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34257,13 +33711,15 @@ impl<'a, C> CreativeFieldGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34525,25 +33981,15 @@ impl<'a, C> CreativeFieldInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34551,13 +33997,15 @@ impl<'a, C> CreativeFieldInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34836,25 +34284,15 @@ impl<'a, C> CreativeFieldListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34862,13 +34300,15 @@ impl<'a, C> CreativeFieldListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35173,25 +34613,15 @@ impl<'a, C> CreativeFieldPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35199,13 +34629,15 @@ impl<'a, C> CreativeFieldPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35476,25 +34908,15 @@ impl<'a, C> CreativeFieldUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35502,13 +34924,15 @@ impl<'a, C> CreativeFieldUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35750,25 +35174,15 @@ impl<'a, C> CreativeGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35776,13 +35190,15 @@ impl<'a, C> CreativeGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36044,25 +35460,15 @@ impl<'a, C> CreativeGroupInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36070,13 +35476,15 @@ impl<'a, C> CreativeGroupInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36360,25 +35768,15 @@ impl<'a, C> CreativeGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36386,13 +35784,15 @@ impl<'a, C> CreativeGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36704,25 +36104,15 @@ impl<'a, C> CreativeGroupPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36730,13 +36120,15 @@ impl<'a, C> CreativeGroupPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37007,25 +36399,15 @@ impl<'a, C> CreativeGroupUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37033,13 +36415,15 @@ impl<'a, C> CreativeGroupUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37281,25 +36665,15 @@ impl<'a, C> CreativeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37307,13 +36681,15 @@ impl<'a, C> CreativeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37575,25 +36951,15 @@ impl<'a, C> CreativeInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37601,13 +36967,15 @@ impl<'a, C> CreativeInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37939,25 +37307,15 @@ impl<'a, C> CreativeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37965,13 +37323,15 @@ impl<'a, C> CreativeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38343,25 +37703,15 @@ impl<'a, C> CreativePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38369,13 +37719,15 @@ impl<'a, C> CreativePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38646,25 +37998,15 @@ impl<'a, C> CreativeUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38672,13 +38014,15 @@ impl<'a, C> CreativeUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38949,25 +38293,15 @@ impl<'a, C> DimensionValueQueryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38975,13 +38309,15 @@ impl<'a, C> DimensionValueQueryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39237,25 +38573,15 @@ impl<'a, C> DirectorySiteGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39263,13 +38589,15 @@ impl<'a, C> DirectorySiteGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39531,25 +38859,15 @@ impl<'a, C> DirectorySiteInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39557,13 +38875,15 @@ impl<'a, C> DirectorySiteInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39860,25 +39180,15 @@ impl<'a, C> DirectorySiteListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39886,13 +39196,15 @@ impl<'a, C> DirectorySiteListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40206,25 +39518,15 @@ impl<'a, C> DynamicTargetingKeyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40232,11 +39534,11 @@ impl<'a, C> DynamicTargetingKeyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -40512,25 +39814,15 @@ impl<'a, C> DynamicTargetingKeyInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40538,13 +39830,15 @@ impl<'a, C> DynamicTargetingKeyInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40806,25 +40100,15 @@ impl<'a, C> DynamicTargetingKeyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40832,13 +40116,15 @@ impl<'a, C> DynamicTargetingKeyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41099,25 +40385,15 @@ impl<'a, C> EventTagDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41125,11 +40401,11 @@ impl<'a, C> EventTagDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -41366,25 +40642,15 @@ impl<'a, C> EventTagGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41392,13 +40658,15 @@ impl<'a, C> EventTagGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41660,25 +40928,15 @@ impl<'a, C> EventTagInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41686,13 +40944,15 @@ impl<'a, C> EventTagInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41986,25 +41246,15 @@ impl<'a, C> EventTagListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42012,13 +41262,15 @@ impl<'a, C> EventTagListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42344,25 +41596,15 @@ impl<'a, C> EventTagPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42370,13 +41612,15 @@ impl<'a, C> EventTagPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42647,25 +41891,15 @@ impl<'a, C> EventTagUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42673,13 +41907,15 @@ impl<'a, C> EventTagUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42942,25 +42178,15 @@ impl<'a, C> FileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42968,19 +42194,21 @@ impl<'a, C> FileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = if enable_resource_parsing { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); } } - } else { (reconstructed_result, Default::default()) }; + } else { (res, Default::default()) }; dlg.finished(true); return Ok(result_value) @@ -43240,25 +42468,15 @@ impl<'a, C> FileListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43266,13 +42484,15 @@ impl<'a, C> FileListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43539,25 +42759,15 @@ impl<'a, C> FloodlightActivityDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43565,11 +42775,11 @@ impl<'a, C> FloodlightActivityDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -43809,25 +43019,15 @@ impl<'a, C> FloodlightActivityGeneratetagCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43835,13 +43035,15 @@ impl<'a, C> FloodlightActivityGeneratetagCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44081,25 +43283,15 @@ impl<'a, C> FloodlightActivityGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44107,13 +43299,15 @@ impl<'a, C> FloodlightActivityGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44375,25 +43569,15 @@ impl<'a, C> FloodlightActivityInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44401,13 +43585,15 @@ impl<'a, C> FloodlightActivityInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44716,25 +43902,15 @@ impl<'a, C> FloodlightActivityListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44742,13 +43918,15 @@ impl<'a, C> FloodlightActivityListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45095,25 +44273,15 @@ impl<'a, C> FloodlightActivityPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45121,13 +44289,15 @@ impl<'a, C> FloodlightActivityPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45398,25 +44568,15 @@ impl<'a, C> FloodlightActivityUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45424,13 +44584,15 @@ impl<'a, C> FloodlightActivityUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45672,25 +44834,15 @@ impl<'a, C> FloodlightActivityGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45698,13 +44850,15 @@ impl<'a, C> FloodlightActivityGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45966,25 +45120,15 @@ impl<'a, C> FloodlightActivityGroupInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45992,13 +45136,15 @@ impl<'a, C> FloodlightActivityGroupInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46285,25 +45431,15 @@ impl<'a, C> FloodlightActivityGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46311,13 +45447,15 @@ impl<'a, C> FloodlightActivityGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46635,25 +45773,15 @@ impl<'a, C> FloodlightActivityGroupPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46661,13 +45789,15 @@ impl<'a, C> FloodlightActivityGroupPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46938,25 +46068,15 @@ impl<'a, C> FloodlightActivityGroupUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46964,13 +46084,15 @@ impl<'a, C> FloodlightActivityGroupUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47212,25 +46334,15 @@ impl<'a, C> FloodlightConfigurationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47238,13 +46350,15 @@ impl<'a, C> FloodlightConfigurationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47492,25 +46606,15 @@ impl<'a, C> FloodlightConfigurationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47518,13 +46622,15 @@ impl<'a, C> FloodlightConfigurationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47786,25 +46892,15 @@ impl<'a, C> FloodlightConfigurationPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47812,13 +46908,15 @@ impl<'a, C> FloodlightConfigurationPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -48089,25 +47187,15 @@ impl<'a, C> FloodlightConfigurationUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -48115,13 +47203,15 @@ impl<'a, C> FloodlightConfigurationUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -48365,25 +47455,15 @@ impl<'a, C> InventoryItemGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -48391,13 +47471,15 @@ impl<'a, C> InventoryItemGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -48701,25 +47783,15 @@ impl<'a, C> InventoryItemListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -48727,13 +47799,15 @@ impl<'a, C> InventoryItemListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49040,25 +48114,15 @@ impl<'a, C> LanguageListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -49066,13 +48130,15 @@ impl<'a, C> LanguageListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49303,25 +48369,15 @@ impl<'a, C> MetroListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -49329,13 +48385,15 @@ impl<'a, C> MetroListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49568,25 +48626,15 @@ impl<'a, C> MobileAppGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -49594,13 +48642,15 @@ impl<'a, C> MobileAppGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49870,25 +48920,15 @@ impl<'a, C> MobileAppListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -49896,13 +48936,15 @@ impl<'a, C> MobileAppListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -50172,25 +49214,15 @@ impl<'a, C> MobileCarrierGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -50198,13 +49230,15 @@ impl<'a, C> MobileCarrierGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -50445,25 +49479,15 @@ impl<'a, C> MobileCarrierListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -50471,13 +49495,15 @@ impl<'a, C> MobileCarrierListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -50710,25 +49736,15 @@ impl<'a, C> OperatingSystemVersionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -50736,13 +49752,15 @@ impl<'a, C> OperatingSystemVersionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -50983,25 +50001,15 @@ impl<'a, C> OperatingSystemVersionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51009,13 +50017,15 @@ impl<'a, C> OperatingSystemVersionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51248,25 +50258,15 @@ impl<'a, C> OperatingSystemGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51274,13 +50274,15 @@ impl<'a, C> OperatingSystemGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51521,25 +50523,15 @@ impl<'a, C> OperatingSystemListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51547,13 +50539,15 @@ impl<'a, C> OperatingSystemListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51788,25 +50782,15 @@ impl<'a, C> OrderDocumentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51814,13 +50798,15 @@ impl<'a, C> OrderDocumentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -52124,25 +51110,15 @@ impl<'a, C> OrderDocumentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -52150,13 +51126,15 @@ impl<'a, C> OrderDocumentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -52467,25 +51445,15 @@ impl<'a, C> OrderGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -52493,13 +51461,15 @@ impl<'a, C> OrderGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -52791,25 +51761,15 @@ impl<'a, C> OrderListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -52817,13 +51777,15 @@ impl<'a, C> OrderListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -53117,25 +52079,15 @@ impl<'a, C> PlacementGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -53143,13 +52095,15 @@ impl<'a, C> PlacementGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -53411,25 +52365,15 @@ impl<'a, C> PlacementGroupInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -53437,13 +52381,15 @@ impl<'a, C> PlacementGroupInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -53794,25 +52740,15 @@ impl<'a, C> PlacementGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -53820,13 +52756,15 @@ impl<'a, C> PlacementGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -54221,25 +53159,15 @@ impl<'a, C> PlacementGroupPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -54247,13 +53175,15 @@ impl<'a, C> PlacementGroupPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -54524,25 +53454,15 @@ impl<'a, C> PlacementGroupUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -54550,13 +53470,15 @@ impl<'a, C> PlacementGroupUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -54797,25 +53719,15 @@ impl<'a, C> PlacementStrategyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -54823,11 +53735,11 @@ impl<'a, C> PlacementStrategyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -55064,25 +53976,15 @@ impl<'a, C> PlacementStrategyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -55090,13 +53992,15 @@ impl<'a, C> PlacementStrategyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -55358,25 +54262,15 @@ impl<'a, C> PlacementStrategyInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -55384,13 +54278,15 @@ impl<'a, C> PlacementStrategyInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -55662,25 +54558,15 @@ impl<'a, C> PlacementStrategyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -55688,13 +54574,15 @@ impl<'a, C> PlacementStrategyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -55991,25 +54879,15 @@ impl<'a, C> PlacementStrategyPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -56017,13 +54895,15 @@ impl<'a, C> PlacementStrategyPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -56294,25 +55174,15 @@ impl<'a, C> PlacementStrategyUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -56320,13 +55190,15 @@ impl<'a, C> PlacementStrategyUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -56585,25 +55457,15 @@ impl<'a, C> PlacementGeneratetagCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -56611,13 +55473,15 @@ impl<'a, C> PlacementGeneratetagCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -56873,25 +55737,15 @@ impl<'a, C> PlacementGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -56899,13 +55753,15 @@ impl<'a, C> PlacementGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -57167,25 +56023,15 @@ impl<'a, C> PlacementInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -57193,13 +56039,15 @@ impl<'a, C> PlacementInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -57571,25 +56419,15 @@ impl<'a, C> PlacementListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -57597,13 +56435,15 @@ impl<'a, C> PlacementListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -58022,25 +56862,15 @@ impl<'a, C> PlacementPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -58048,13 +56878,15 @@ impl<'a, C> PlacementPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -58325,25 +57157,15 @@ impl<'a, C> PlacementUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -58351,13 +57173,15 @@ impl<'a, C> PlacementUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -58599,25 +57423,15 @@ impl<'a, C> PlatformTypeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -58625,13 +57439,15 @@ impl<'a, C> PlatformTypeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -58872,25 +57688,15 @@ impl<'a, C> PlatformTypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -58898,13 +57704,15 @@ impl<'a, C> PlatformTypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -59137,25 +57945,15 @@ impl<'a, C> PostalCodeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -59163,13 +57961,15 @@ impl<'a, C> PostalCodeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -59410,25 +58210,15 @@ impl<'a, C> PostalCodeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -59436,13 +58226,15 @@ impl<'a, C> PostalCodeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -59675,25 +58467,15 @@ impl<'a, C> ProjectGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -59701,13 +58483,15 @@ impl<'a, C> ProjectGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -59987,25 +58771,15 @@ impl<'a, C> ProjectListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -60013,13 +58787,15 @@ impl<'a, C> ProjectListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -60301,25 +59077,15 @@ impl<'a, C> RegionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -60327,13 +59093,15 @@ impl<'a, C> RegionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -60566,25 +59334,15 @@ impl<'a, C> RemarketingListShareGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -60592,13 +59350,15 @@ impl<'a, C> RemarketingListShareGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -60862,25 +59622,15 @@ impl<'a, C> RemarketingListSharePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -60888,13 +59638,15 @@ impl<'a, C> RemarketingListSharePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -61165,25 +59917,15 @@ impl<'a, C> RemarketingListShareUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -61191,13 +59933,15 @@ impl<'a, C> RemarketingListShareUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -61439,25 +60183,15 @@ impl<'a, C> RemarketingListGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -61465,13 +60199,15 @@ impl<'a, C> RemarketingListGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -61733,25 +60469,15 @@ impl<'a, C> RemarketingListInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -61759,13 +60485,15 @@ impl<'a, C> RemarketingListInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -62042,25 +60770,15 @@ impl<'a, C> RemarketingListListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -62068,13 +60786,15 @@ impl<'a, C> RemarketingListListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -62387,25 +61107,15 @@ impl<'a, C> RemarketingListPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -62413,13 +61123,15 @@ impl<'a, C> RemarketingListPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -62690,25 +61402,15 @@ impl<'a, C> RemarketingListUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -62716,13 +61418,15 @@ impl<'a, C> RemarketingListUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -62983,25 +61687,15 @@ impl<'a, C> ReportCompatibleFieldQueryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -63009,13 +61703,15 @@ impl<'a, C> ReportCompatibleFieldQueryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -63280,25 +61976,15 @@ impl<'a, C> ReportFileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -63306,19 +61992,21 @@ impl<'a, C> ReportFileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = if enable_resource_parsing { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); } } - } else { (reconstructed_result, Default::default()) }; + } else { (res, Default::default()) }; dlg.finished(true); return Ok(result_value) @@ -63585,25 +62273,15 @@ impl<'a, C> ReportFileListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -63611,13 +62289,15 @@ impl<'a, C> ReportFileListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -63887,25 +62567,15 @@ impl<'a, C> ReportDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -63913,11 +62583,11 @@ impl<'a, C> ReportDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -64154,25 +62824,15 @@ impl<'a, C> ReportGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -64180,13 +62840,15 @@ impl<'a, C> ReportGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -64448,25 +63110,15 @@ impl<'a, C> ReportInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -64474,13 +63126,15 @@ impl<'a, C> ReportInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -64745,25 +63399,15 @@ impl<'a, C> ReportListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -64771,13 +63415,15 @@ impl<'a, C> ReportListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -65066,25 +63712,15 @@ impl<'a, C> ReportPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -65092,13 +63728,15 @@ impl<'a, C> ReportPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -65355,25 +63993,15 @@ impl<'a, C> ReportRunCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -65381,13 +64009,15 @@ impl<'a, C> ReportRunCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -65658,25 +64288,15 @@ impl<'a, C> ReportUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -65684,13 +64304,15 @@ impl<'a, C> ReportUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -65942,25 +64564,15 @@ impl<'a, C> SiteGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -65968,13 +64580,15 @@ impl<'a, C> SiteGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -66236,25 +64850,15 @@ impl<'a, C> SiteInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -66262,13 +64866,15 @@ impl<'a, C> SiteInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -66589,25 +65195,15 @@ impl<'a, C> SiteListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -66615,13 +65211,15 @@ impl<'a, C> SiteListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -66983,25 +65581,15 @@ impl<'a, C> SitePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -67009,13 +65597,15 @@ impl<'a, C> SitePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -67286,25 +65876,15 @@ impl<'a, C> SiteUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -67312,13 +65892,15 @@ impl<'a, C> SiteUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -67560,25 +66142,15 @@ impl<'a, C> SizeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -67586,13 +66158,15 @@ impl<'a, C> SizeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -67854,25 +66428,15 @@ impl<'a, C> SizeInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -67880,13 +66444,15 @@ impl<'a, C> SizeInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -68148,25 +66714,15 @@ impl<'a, C> SizeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -68174,13 +66730,15 @@ impl<'a, C> SizeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -68442,25 +67000,15 @@ impl<'a, C> SubaccountGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -68468,13 +67016,15 @@ impl<'a, C> SubaccountGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -68736,25 +67286,15 @@ impl<'a, C> SubaccountInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -68762,13 +67302,15 @@ impl<'a, C> SubaccountInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -69040,25 +67582,15 @@ impl<'a, C> SubaccountListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -69066,13 +67598,15 @@ impl<'a, C> SubaccountListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -69369,25 +67903,15 @@ impl<'a, C> SubaccountPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -69395,13 +67919,15 @@ impl<'a, C> SubaccountPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -69672,25 +68198,15 @@ impl<'a, C> SubaccountUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -69698,13 +68214,15 @@ impl<'a, C> SubaccountUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -69946,25 +68464,15 @@ impl<'a, C> TargetableRemarketingListGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -69972,13 +68480,15 @@ impl<'a, C> TargetableRemarketingListGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -70251,25 +68761,15 @@ impl<'a, C> TargetableRemarketingListListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -70277,13 +68777,15 @@ impl<'a, C> TargetableRemarketingListListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -70568,25 +69070,15 @@ impl<'a, C> TargetingTemplateGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -70594,13 +69086,15 @@ impl<'a, C> TargetingTemplateGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -70862,25 +69356,15 @@ impl<'a, C> TargetingTemplateInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -70888,13 +69372,15 @@ impl<'a, C> TargetingTemplateInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -71171,25 +69657,15 @@ impl<'a, C> TargetingTemplateListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -71197,13 +69673,15 @@ impl<'a, C> TargetingTemplateListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -71507,25 +69985,15 @@ impl<'a, C> TargetingTemplatePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -71533,13 +70001,15 @@ impl<'a, C> TargetingTemplatePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -71810,25 +70280,15 @@ impl<'a, C> TargetingTemplateUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -71836,13 +70296,15 @@ impl<'a, C> TargetingTemplateUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -72082,25 +70544,15 @@ impl<'a, C> UserProfileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -72108,13 +70560,15 @@ impl<'a, C> UserProfileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -72322,25 +70776,15 @@ impl<'a, C> UserProfileListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -72348,13 +70792,15 @@ impl<'a, C> UserProfileListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -72577,25 +71023,15 @@ impl<'a, C> UserRolePermissionGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -72603,13 +71039,15 @@ impl<'a, C> UserRolePermissionGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -72850,25 +71288,15 @@ impl<'a, C> UserRolePermissionGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -72876,13 +71304,15 @@ impl<'a, C> UserRolePermissionGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -73115,25 +71545,15 @@ impl<'a, C> UserRolePermissionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -73141,13 +71561,15 @@ impl<'a, C> UserRolePermissionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -73395,25 +71817,15 @@ impl<'a, C> UserRolePermissionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -73421,13 +71833,15 @@ impl<'a, C> UserRolePermissionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -73667,25 +72081,15 @@ impl<'a, C> UserRoleDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -73693,11 +72097,11 @@ impl<'a, C> UserRoleDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -73934,25 +72338,15 @@ impl<'a, C> UserRoleGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -73960,13 +72354,15 @@ impl<'a, C> UserRoleGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -74228,25 +72624,15 @@ impl<'a, C> UserRoleInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -74254,13 +72640,15 @@ impl<'a, C> UserRoleInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -74542,25 +72930,15 @@ impl<'a, C> UserRoleListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -74568,13 +72946,15 @@ impl<'a, C> UserRoleListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -74885,25 +73265,15 @@ impl<'a, C> UserRolePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -74911,13 +73281,15 @@ impl<'a, C> UserRolePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -75188,25 +73560,15 @@ impl<'a, C> UserRoleUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -75214,13 +73576,15 @@ impl<'a, C> UserRoleUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -75462,25 +73826,15 @@ impl<'a, C> VideoFormatGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -75488,13 +73842,15 @@ impl<'a, C> VideoFormatGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -75735,25 +74091,15 @@ impl<'a, C> VideoFormatListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -75761,13 +74107,15 @@ impl<'a, C> VideoFormatListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/dfareporting3d3/src/client.rs b/gen/dfareporting3d3/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/dfareporting3d3/src/client.rs +++ b/gen/dfareporting3d3/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/dfareporting3d4-cli/src/main.rs b/gen/dfareporting3d4-cli/src/main.rs index ef0d48f38b..e7a13c50a9 100644 --- a/gen/dfareporting3d4-cli/src/main.rs +++ b/gen/dfareporting3d4-cli/src/main.rs @@ -508,7 +508,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-role-id", "page-token", "sort-field", "max-results", "subaccount-id", "search-string", "sort-order", "ids", "active"].iter().map(|v|*v)); + v.extend(["active", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order", "subaccount-id", "user-role-id"].iter().map(|v|*v)); v } )); } } @@ -850,7 +850,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results", "sort-field", "search-string", "sort-order", "ids", "active"].iter().map(|v|*v)); + v.extend(["active", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -1386,7 +1386,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["type", "page-token", "sort-field", "max-results", "dynamic-click-tracker", "archived", "search-string", "placement-ids", "audience-segment-ids", "advertiser-id", "ssl-required", "creative-optimization-configuration-ids", "ssl-compliant", "campaign-ids", "active", "landing-page-ids", "overridden-event-tag-id", "remarketing-list-ids", "compatibility", "sort-order", "ids", "size-ids", "creative-ids"].iter().map(|v|*v)); + v.extend(["active", "advertiser-id", "archived", "audience-segment-ids", "campaign-ids", "compatibility", "creative-ids", "creative-optimization-configuration-ids", "dynamic-click-tracker", "ids", "landing-page-ids", "max-results", "overridden-event-tag-id", "page-token", "placement-ids", "remarketing-list-ids", "search-string", "size-ids", "sort-field", "sort-order", "ssl-compliant", "ssl-required", "type"].iter().map(|v|*v)); v } )); } } @@ -1941,7 +1941,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results", "sort-field", "search-string", "sort-order", "ids"].iter().map(|v|*v)); + v.extend(["ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -2342,7 +2342,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "sort-field", "max-results", "archived", "subaccount-id", "search-string", "sort-order", "ids", "campaign-ids", "advertiser-ids"].iter().map(|v|*v)); + v.extend(["advertiser-ids", "archived", "campaign-ids", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order", "subaccount-id"].iter().map(|v|*v)); v } )); } } @@ -2772,7 +2772,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "sort-field", "max-results", "subaccount-id", "search-string", "sort-order", "status", "only-parent", "include-advertisers-without-groups-only", "ids", "floodlight-configuration-ids", "advertiser-group-ids"].iter().map(|v|*v)); + v.extend(["advertiser-group-ids", "floodlight-configuration-ids", "ids", "include-advertisers-without-groups-only", "max-results", "only-parent", "page-token", "search-string", "sort-field", "sort-order", "status", "subaccount-id"].iter().map(|v|*v)); v } )); } } @@ -3190,7 +3190,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-order", "page-token", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -3460,7 +3460,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "sort-field", "max-results", "at-least-one-optimization-activity", "archived", "subaccount-id", "search-string", "sort-order", "ids", "advertiser-group-ids", "excluded-ids", "advertiser-ids", "overridden-event-tag-id"].iter().map(|v|*v)); + v.extend(["advertiser-group-ids", "advertiser-ids", "archived", "at-least-one-optimization-activity", "excluded-ids", "ids", "max-results", "overridden-event-tag-id", "page-token", "search-string", "sort-field", "sort-order", "subaccount-id"].iter().map(|v|*v)); v } )); } } @@ -3847,7 +3847,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["object-ids", "page-token", "max-results", "action", "search-string", "min-change-time", "max-change-time", "ids", "user-profile-ids", "object-type"].iter().map(|v|*v)); + v.extend(["action", "ids", "max-change-time", "max-results", "min-change-time", "object-ids", "object-type", "page-token", "search-string", "user-profile-ids"].iter().map(|v|*v)); v } )); } } @@ -3912,7 +3912,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["dart-ids", "name-prefix", "country-dart-ids", "region-dart-ids"].iter().map(|v|*v)); + v.extend(["country-dart-ids", "dart-ids", "name-prefix", "region-dart-ids"].iter().map(|v|*v)); v } )); } } @@ -4271,7 +4271,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results", "sort-field", "search-string", "sort-order", "ids"].iter().map(|v|*v)); + v.extend(["ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -5083,7 +5083,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results", "sort-field", "search-string", "sort-order", "ids"].iter().map(|v|*v)); + v.extend(["ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -5523,7 +5523,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results", "sort-field", "search-string", "sort-order", "ids", "advertiser-ids"].iter().map(|v|*v)); + v.extend(["advertiser-ids", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -5941,7 +5941,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results", "sort-field", "search-string", "group-number", "sort-order", "ids", "advertiser-ids"].iter().map(|v|*v)); + v.extend(["advertiser-ids", "group-number", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -6464,7 +6464,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["advertiser-id", "page-token", "sort-field", "max-results", "companion-creative-ids", "archived", "search-string", "sort-order", "rendering-ids", "ids", "creative-field-ids", "active", "size-ids", "campaign-id", "studio-creative-id", "types"].iter().map(|v|*v)); + v.extend(["active", "advertiser-id", "archived", "campaign-id", "companion-creative-ids", "creative-field-ids", "ids", "max-results", "page-token", "rendering-ids", "search-string", "size-ids", "sort-field", "sort-order", "studio-creative-id", "types"].iter().map(|v|*v)); v } )); } } @@ -6996,7 +6996,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -7238,7 +7238,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["accepts-interstitial-placements", "page-token", "max-results", "sort-field", "search-string", "accepts-publisher-paid-placements", "sort-order", "dfp-network-code", "ids", "accepts-in-stream-video-placements", "active"].iter().map(|v|*v)); + v.extend(["accepts-in-stream-video-placements", "accepts-interstitial-placements", "accepts-publisher-paid-placements", "active", "dfp-network-code", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -7435,7 +7435,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["advertiser-id", "object-id", "names", "object-type"].iter().map(|v|*v)); + v.extend(["advertiser-id", "names", "object-id", "object-type"].iter().map(|v|*v)); v } )); } } @@ -7726,7 +7726,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["enabled", "advertiser-id", "sort-field", "search-string", "sort-order", "ids", "ad-id", "campaign-id", "definitions-only", "event-tag-types"].iter().map(|v|*v)); + v.extend(["ad-id", "advertiser-id", "campaign-id", "definitions-only", "enabled", "event-tag-types", "ids", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -8080,7 +8080,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results", "sort-field", "sort-order", "scope"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "scope", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -8450,7 +8450,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["advertiser-id", "page-token", "sort-field", "max-results", "floodlight-activity-group-tag-string", "floodlight-activity-group-name", "search-string", "sort-order", "ids", "floodlight-activity-group-type", "floodlight-activity-group-ids", "tag-string", "floodlight-configuration-id"].iter().map(|v|*v)); + v.extend(["advertiser-id", "floodlight-activity-group-ids", "floodlight-activity-group-name", "floodlight-activity-group-tag-string", "floodlight-activity-group-type", "floodlight-configuration-id", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order", "tag-string"].iter().map(|v|*v)); v } )); } } @@ -8945,7 +8945,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["advertiser-id", "type", "page-token", "sort-field", "max-results", "search-string", "sort-order", "ids", "floodlight-configuration-id"].iter().map(|v|*v)); + v.extend(["advertiser-id", "floodlight-configuration-id", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order", "type"].iter().map(|v|*v)); v } )); } } @@ -9643,7 +9643,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["type", "page-token", "sort-field", "order-id", "max-results", "in-plan", "sort-order", "ids", "site-id"].iter().map(|v|*v)); + v.extend(["ids", "in-plan", "max-results", "order-id", "page-token", "site-id", "sort-field", "sort-order", "type"].iter().map(|v|*v)); v } )); } } @@ -9867,7 +9867,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results", "search-string", "ids", "directories"].iter().map(|v|*v)); + v.extend(["directories", "ids", "max-results", "page-token", "search-string"].iter().map(|v|*v)); v } )); } } @@ -10311,7 +10311,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "sort-field", "order-id", "max-results", "search-string", "sort-order", "ids", "site-id", "approved"].iter().map(|v|*v)); + v.extend(["approved", "ids", "max-results", "order-id", "page-token", "search-string", "site-id", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -10437,7 +10437,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "sort-field", "max-results", "search-string", "sort-order", "ids", "site-id"].iter().map(|v|*v)); + v.extend(["ids", "max-results", "page-token", "search-string", "site-id", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -10745,7 +10745,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["site-ids", "page-token", "sort-field", "max-results", "min-end-date", "pricing-types", "max-end-date", "archived", "search-string", "placement-strategy-ids", "placement-group-type", "directory-site-ids", "advertiser-ids", "content-category-ids", "min-start-date", "campaign-ids", "sort-order", "ids", "max-start-date"].iter().map(|v|*v)); + v.extend(["advertiser-ids", "archived", "campaign-ids", "content-category-ids", "directory-site-ids", "ids", "max-end-date", "max-results", "max-start-date", "min-end-date", "min-start-date", "page-token", "placement-group-type", "placement-strategy-ids", "pricing-types", "search-string", "site-ids", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -11292,7 +11292,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results", "sort-field", "search-string", "sort-order", "ids"].iter().map(|v|*v)); + v.extend(["ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -11530,7 +11530,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["tag-formats", "campaign-id", "placement-ids"].iter().map(|v|*v)); + v.extend(["campaign-id", "placement-ids", "tag-formats"].iter().map(|v|*v)); v } )); } } @@ -11894,7 +11894,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["site-ids", "page-token", "sort-field", "max-results", "min-end-date", "pricing-types", "max-end-date", "archived", "search-string", "placement-strategy-ids", "directory-site-ids", "advertiser-ids", "content-category-ids", "min-start-date", "compatibilities", "campaign-ids", "payment-source", "sort-order", "ids", "size-ids", "group-ids", "max-start-date"].iter().map(|v|*v)); + v.extend(["advertiser-ids", "archived", "campaign-ids", "compatibilities", "content-category-ids", "directory-site-ids", "group-ids", "ids", "max-end-date", "max-results", "max-start-date", "min-end-date", "min-start-date", "page-token", "payment-source", "placement-strategy-ids", "pricing-types", "search-string", "site-ids", "size-ids", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -12614,7 +12614,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results", "sort-field", "search-string", "sort-order", "ids", "advertiser-ids"].iter().map(|v|*v)); + v.extend(["advertiser-ids", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -13123,7 +13123,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "sort-field", "max-results", "sort-order", "floodlight-activity-id", "name", "active"].iter().map(|v|*v)); + v.extend(["active", "floodlight-activity-id", "max-results", "name", "page-token", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -13693,7 +13693,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "sort-order", "page-token", "sort-field"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -14006,7 +14006,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results", "sort-field", "sort-order", "scope"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "scope", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -14737,7 +14737,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["accepts-interstitial-placements", "accepts-in-stream-video-placements", "page-token", "sort-field", "unmapped-site", "max-results", "subaccount-id", "search-string", "sort-order", "accepts-publisher-paid-placements", "ids", "directory-site-ids", "campaign-ids", "ad-words-site", "approved"].iter().map(|v|*v)); + v.extend(["accepts-in-stream-video-placements", "accepts-interstitial-placements", "accepts-publisher-paid-placements", "ad-words-site", "approved", "campaign-ids", "directory-site-ids", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order", "subaccount-id", "unmapped-site"].iter().map(|v|*v)); v } )); } } @@ -15221,7 +15221,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["ids", "iab-standard", "width", "height"].iter().map(|v|*v)); + v.extend(["height", "iab-standard", "ids", "width"].iter().map(|v|*v)); v } )); } } @@ -15433,7 +15433,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results", "sort-field", "search-string", "sort-order", "ids"].iter().map(|v|*v)); + v.extend(["ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -15734,7 +15734,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "sort-field", "max-results", "sort-order", "name", "active"].iter().map(|v|*v)); + v.extend(["active", "max-results", "name", "page-token", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -15962,7 +15962,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["advertiser-id", "page-token", "max-results", "sort-field", "search-string", "sort-order", "ids"].iter().map(|v|*v)); + v.extend(["advertiser-id", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -16746,7 +16746,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "sort-field", "max-results", "subaccount-id", "search-string", "sort-order", "ids", "account-user-role-only"].iter().map(|v|*v)); + v.extend(["account-user-role-only", "ids", "max-results", "page-token", "search-string", "sort-field", "sort-order", "subaccount-id"].iter().map(|v|*v)); v } )); } } diff --git a/gen/dfareporting3d4/src/api.rs b/gen/dfareporting3d4/src/api.rs index 4a20f5fd65..67a511fadf 100644 --- a/gen/dfareporting3d4/src/api.rs +++ b/gen/dfareporting3d4/src/api.rs @@ -14717,25 +14717,15 @@ impl<'a, C> AccountActiveAdSummaryGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14743,13 +14733,15 @@ impl<'a, C> AccountActiveAdSummaryGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14992,25 +14984,15 @@ impl<'a, C> AccountPermissionGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15018,13 +15000,15 @@ impl<'a, C> AccountPermissionGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15265,25 +15249,15 @@ impl<'a, C> AccountPermissionGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15291,13 +15265,15 @@ impl<'a, C> AccountPermissionGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15530,25 +15506,15 @@ impl<'a, C> AccountPermissionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15556,13 +15522,15 @@ impl<'a, C> AccountPermissionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15803,25 +15771,15 @@ impl<'a, C> AccountPermissionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15829,13 +15787,15 @@ impl<'a, C> AccountPermissionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16068,25 +16028,15 @@ impl<'a, C> AccountUserProfileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16094,13 +16044,15 @@ impl<'a, C> AccountUserProfileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16362,25 +16314,15 @@ impl<'a, C> AccountUserProfileInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16388,13 +16330,15 @@ impl<'a, C> AccountUserProfileInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16681,25 +16625,15 @@ impl<'a, C> AccountUserProfileListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16707,13 +16641,15 @@ impl<'a, C> AccountUserProfileListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17031,25 +16967,15 @@ impl<'a, C> AccountUserProfilePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17057,13 +16983,15 @@ impl<'a, C> AccountUserProfilePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17334,25 +17262,15 @@ impl<'a, C> AccountUserProfileUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17360,13 +17278,15 @@ impl<'a, C> AccountUserProfileUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17608,25 +17528,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17634,13 +17544,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17918,25 +17830,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17944,13 +17846,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18254,25 +18158,15 @@ impl<'a, C> AccountPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18280,13 +18174,15 @@ impl<'a, C> AccountPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18557,25 +18453,15 @@ impl<'a, C> AccountUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18583,13 +18469,15 @@ impl<'a, C> AccountUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18831,25 +18719,15 @@ impl<'a, C> AdGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18857,13 +18735,15 @@ impl<'a, C> AdGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19125,25 +19005,15 @@ impl<'a, C> AdInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19151,13 +19021,15 @@ impl<'a, C> AdInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19532,25 +19404,15 @@ impl<'a, C> AdListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19558,13 +19420,15 @@ impl<'a, C> AdListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19989,25 +19853,15 @@ impl<'a, C> AdPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20015,13 +19869,15 @@ impl<'a, C> AdPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20292,25 +20148,15 @@ impl<'a, C> AdUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20318,13 +20164,15 @@ impl<'a, C> AdUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20565,25 +20413,15 @@ impl<'a, C> AdvertiserGroupDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20591,11 +20429,11 @@ impl<'a, C> AdvertiserGroupDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -20832,25 +20670,15 @@ impl<'a, C> AdvertiserGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20858,13 +20686,15 @@ impl<'a, C> AdvertiserGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21126,25 +20956,15 @@ impl<'a, C> AdvertiserGroupInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21152,13 +20972,15 @@ impl<'a, C> AdvertiserGroupInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21430,25 +21252,15 @@ impl<'a, C> AdvertiserGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21456,13 +21268,15 @@ impl<'a, C> AdvertiserGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21759,25 +21573,15 @@ impl<'a, C> AdvertiserGroupPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21785,13 +21589,15 @@ impl<'a, C> AdvertiserGroupPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22062,25 +21868,15 @@ impl<'a, C> AdvertiserGroupUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22088,13 +21884,15 @@ impl<'a, C> AdvertiserGroupUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22336,25 +22134,15 @@ impl<'a, C> AdvertiserLandingPageGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22362,13 +22150,15 @@ impl<'a, C> AdvertiserLandingPageGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22630,25 +22420,15 @@ impl<'a, C> AdvertiserLandingPageInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22656,13 +22436,15 @@ impl<'a, C> AdvertiserLandingPageInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22958,25 +22740,15 @@ impl<'a, C> AdvertiserLandingPageListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22984,13 +22756,15 @@ impl<'a, C> AdvertiserLandingPageListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23317,25 +23091,15 @@ impl<'a, C> AdvertiserLandingPagePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23343,13 +23107,15 @@ impl<'a, C> AdvertiserLandingPagePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23620,25 +23386,15 @@ impl<'a, C> AdvertiserLandingPageUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23646,13 +23402,15 @@ impl<'a, C> AdvertiserLandingPageUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23894,25 +23652,15 @@ impl<'a, C> AdvertiserGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23920,13 +23668,15 @@ impl<'a, C> AdvertiserGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24188,25 +23938,15 @@ impl<'a, C> AdvertiserInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24214,13 +23954,15 @@ impl<'a, C> AdvertiserInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24526,25 +24268,15 @@ impl<'a, C> AdvertiserListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24552,13 +24284,15 @@ impl<'a, C> AdvertiserListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24899,25 +24633,15 @@ impl<'a, C> AdvertiserPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24925,13 +24649,15 @@ impl<'a, C> AdvertiserPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25202,25 +24928,15 @@ impl<'a, C> AdvertiserUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25228,13 +24944,15 @@ impl<'a, C> AdvertiserUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25474,25 +25192,15 @@ impl<'a, C> BrowserListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25500,13 +25208,15 @@ impl<'a, C> BrowserListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25760,25 +25470,15 @@ impl<'a, C> CampaignCreativeAssociationInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25786,13 +25486,15 @@ impl<'a, C> CampaignCreativeAssociationInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26059,25 +25761,15 @@ impl<'a, C> CampaignCreativeAssociationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26085,13 +25777,15 @@ impl<'a, C> CampaignCreativeAssociationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26355,25 +26049,15 @@ impl<'a, C> CampaignGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26381,13 +26065,15 @@ impl<'a, C> CampaignGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26649,25 +26335,15 @@ impl<'a, C> CampaignInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26675,13 +26351,15 @@ impl<'a, C> CampaignInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26994,25 +26672,15 @@ impl<'a, C> CampaignListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27020,13 +26688,15 @@ impl<'a, C> CampaignListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27375,25 +27045,15 @@ impl<'a, C> CampaignPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27401,13 +27061,15 @@ impl<'a, C> CampaignPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27678,25 +27340,15 @@ impl<'a, C> CampaignUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27704,13 +27356,15 @@ impl<'a, C> CampaignUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27952,25 +27606,15 @@ impl<'a, C> ChangeLogGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27978,13 +27622,15 @@ impl<'a, C> ChangeLogGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28281,25 +27927,15 @@ impl<'a, C> ChangeLogListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28307,13 +27943,15 @@ impl<'a, C> ChangeLogListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28643,25 +28281,15 @@ impl<'a, C> CityListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28669,13 +28297,15 @@ impl<'a, C> CityListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28939,25 +28569,15 @@ impl<'a, C> ConnectionTypeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28965,13 +28585,15 @@ impl<'a, C> ConnectionTypeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29212,25 +28834,15 @@ impl<'a, C> ConnectionTypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29238,13 +28850,15 @@ impl<'a, C> ConnectionTypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29476,25 +29090,15 @@ impl<'a, C> ContentCategoryDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29502,11 +29106,11 @@ impl<'a, C> ContentCategoryDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -29743,25 +29347,15 @@ impl<'a, C> ContentCategoryGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29769,13 +29363,15 @@ impl<'a, C> ContentCategoryGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30037,25 +29633,15 @@ impl<'a, C> ContentCategoryInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30063,13 +29649,15 @@ impl<'a, C> ContentCategoryInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30341,25 +29929,15 @@ impl<'a, C> ContentCategoryListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30367,13 +29945,15 @@ impl<'a, C> ContentCategoryListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30670,25 +30250,15 @@ impl<'a, C> ContentCategoryPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30696,13 +30266,15 @@ impl<'a, C> ContentCategoryPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30973,25 +30545,15 @@ impl<'a, C> ContentCategoryUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30999,13 +30561,15 @@ impl<'a, C> ContentCategoryUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31266,25 +30830,15 @@ impl<'a, C> ConversionBatchinsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31292,13 +30846,15 @@ impl<'a, C> ConversionBatchinsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31559,25 +31115,15 @@ impl<'a, C> ConversionBatchupdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31585,13 +31131,15 @@ impl<'a, C> ConversionBatchupdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31833,25 +31381,15 @@ impl<'a, C> CountryGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31859,13 +31397,15 @@ impl<'a, C> CountryGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32106,25 +31646,15 @@ impl<'a, C> CountryListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32132,13 +31662,15 @@ impl<'a, C> CountryListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32417,25 +31949,15 @@ impl<'a, C> CreativeAssetInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32443,13 +31965,15 @@ impl<'a, C> CreativeAssetInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32712,25 +32236,15 @@ impl<'a, C> CreativeFieldValueDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32738,11 +32252,11 @@ impl<'a, C> CreativeFieldValueDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -32991,25 +32505,15 @@ impl<'a, C> CreativeFieldValueGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33017,13 +32521,15 @@ impl<'a, C> CreativeFieldValueGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33297,25 +32803,15 @@ impl<'a, C> CreativeFieldValueInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33323,13 +32819,15 @@ impl<'a, C> CreativeFieldValueInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33613,25 +33111,15 @@ impl<'a, C> CreativeFieldValueListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33639,13 +33127,15 @@ impl<'a, C> CreativeFieldValueListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33954,25 +33444,15 @@ impl<'a, C> CreativeFieldValuePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33980,13 +33460,15 @@ impl<'a, C> CreativeFieldValuePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34269,25 +33751,15 @@ impl<'a, C> CreativeFieldValueUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34295,13 +33767,15 @@ impl<'a, C> CreativeFieldValueUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34552,25 +34026,15 @@ impl<'a, C> CreativeFieldDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34578,11 +34042,11 @@ impl<'a, C> CreativeFieldDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -34819,25 +34283,15 @@ impl<'a, C> CreativeFieldGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34845,13 +34299,15 @@ impl<'a, C> CreativeFieldGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35113,25 +34569,15 @@ impl<'a, C> CreativeFieldInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35139,13 +34585,15 @@ impl<'a, C> CreativeFieldInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35424,25 +34872,15 @@ impl<'a, C> CreativeFieldListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35450,13 +34888,15 @@ impl<'a, C> CreativeFieldListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35761,25 +35201,15 @@ impl<'a, C> CreativeFieldPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35787,13 +35217,15 @@ impl<'a, C> CreativeFieldPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36064,25 +35496,15 @@ impl<'a, C> CreativeFieldUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36090,13 +35512,15 @@ impl<'a, C> CreativeFieldUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36338,25 +35762,15 @@ impl<'a, C> CreativeGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36364,13 +35778,15 @@ impl<'a, C> CreativeGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36632,25 +36048,15 @@ impl<'a, C> CreativeGroupInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36658,13 +36064,15 @@ impl<'a, C> CreativeGroupInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36948,25 +36356,15 @@ impl<'a, C> CreativeGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36974,13 +36372,15 @@ impl<'a, C> CreativeGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37292,25 +36692,15 @@ impl<'a, C> CreativeGroupPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37318,13 +36708,15 @@ impl<'a, C> CreativeGroupPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37595,25 +36987,15 @@ impl<'a, C> CreativeGroupUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37621,13 +37003,15 @@ impl<'a, C> CreativeGroupUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37869,25 +37253,15 @@ impl<'a, C> CreativeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37895,13 +37269,15 @@ impl<'a, C> CreativeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38163,25 +37539,15 @@ impl<'a, C> CreativeInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38189,13 +37555,15 @@ impl<'a, C> CreativeInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38527,25 +37895,15 @@ impl<'a, C> CreativeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38553,13 +37911,15 @@ impl<'a, C> CreativeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38931,25 +38291,15 @@ impl<'a, C> CreativePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38957,13 +38307,15 @@ impl<'a, C> CreativePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39234,25 +38586,15 @@ impl<'a, C> CreativeUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39260,13 +38602,15 @@ impl<'a, C> CreativeUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39527,25 +38871,15 @@ impl<'a, C> CustomEventBatchinsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39553,13 +38887,15 @@ impl<'a, C> CustomEventBatchinsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39830,25 +39166,15 @@ impl<'a, C> DimensionValueQueryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39856,13 +39182,15 @@ impl<'a, C> DimensionValueQueryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40118,25 +39446,15 @@ impl<'a, C> DirectorySiteGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40144,13 +39462,15 @@ impl<'a, C> DirectorySiteGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40412,25 +39732,15 @@ impl<'a, C> DirectorySiteInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40438,13 +39748,15 @@ impl<'a, C> DirectorySiteInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40741,25 +40053,15 @@ impl<'a, C> DirectorySiteListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40767,13 +40069,15 @@ impl<'a, C> DirectorySiteListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41087,25 +40391,15 @@ impl<'a, C> DynamicTargetingKeyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41113,11 +40407,11 @@ impl<'a, C> DynamicTargetingKeyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -41393,25 +40687,15 @@ impl<'a, C> DynamicTargetingKeyInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41419,13 +40703,15 @@ impl<'a, C> DynamicTargetingKeyInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41687,25 +40973,15 @@ impl<'a, C> DynamicTargetingKeyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41713,13 +40989,15 @@ impl<'a, C> DynamicTargetingKeyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41980,25 +41258,15 @@ impl<'a, C> EventTagDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42006,11 +41274,11 @@ impl<'a, C> EventTagDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -42247,25 +41515,15 @@ impl<'a, C> EventTagGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42273,13 +41531,15 @@ impl<'a, C> EventTagGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42541,25 +41801,15 @@ impl<'a, C> EventTagInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42567,13 +41817,15 @@ impl<'a, C> EventTagInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42867,25 +42119,15 @@ impl<'a, C> EventTagListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42893,13 +42135,15 @@ impl<'a, C> EventTagListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43225,25 +42469,15 @@ impl<'a, C> EventTagPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43251,13 +42485,15 @@ impl<'a, C> EventTagPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43528,25 +42764,15 @@ impl<'a, C> EventTagUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43554,13 +42780,15 @@ impl<'a, C> EventTagUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43823,25 +43051,15 @@ impl<'a, C> FileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43849,19 +43067,21 @@ impl<'a, C> FileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = if enable_resource_parsing { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); } } - } else { (reconstructed_result, Default::default()) }; + } else { (res, Default::default()) }; dlg.finished(true); return Ok(result_value) @@ -44121,25 +43341,15 @@ impl<'a, C> FileListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44147,13 +43357,15 @@ impl<'a, C> FileListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44420,25 +43632,15 @@ impl<'a, C> FloodlightActivityDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44446,11 +43648,11 @@ impl<'a, C> FloodlightActivityDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -44690,25 +43892,15 @@ impl<'a, C> FloodlightActivityGeneratetagCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44716,13 +43908,15 @@ impl<'a, C> FloodlightActivityGeneratetagCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44962,25 +44156,15 @@ impl<'a, C> FloodlightActivityGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44988,13 +44172,15 @@ impl<'a, C> FloodlightActivityGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45256,25 +44442,15 @@ impl<'a, C> FloodlightActivityInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45282,13 +44458,15 @@ impl<'a, C> FloodlightActivityInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45597,25 +44775,15 @@ impl<'a, C> FloodlightActivityListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45623,13 +44791,15 @@ impl<'a, C> FloodlightActivityListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45976,25 +45146,15 @@ impl<'a, C> FloodlightActivityPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46002,13 +45162,15 @@ impl<'a, C> FloodlightActivityPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46279,25 +45441,15 @@ impl<'a, C> FloodlightActivityUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46305,13 +45457,15 @@ impl<'a, C> FloodlightActivityUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46553,25 +45707,15 @@ impl<'a, C> FloodlightActivityGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46579,13 +45723,15 @@ impl<'a, C> FloodlightActivityGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46847,25 +45993,15 @@ impl<'a, C> FloodlightActivityGroupInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46873,13 +46009,15 @@ impl<'a, C> FloodlightActivityGroupInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47166,25 +46304,15 @@ impl<'a, C> FloodlightActivityGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47192,13 +46320,15 @@ impl<'a, C> FloodlightActivityGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47516,25 +46646,15 @@ impl<'a, C> FloodlightActivityGroupPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47542,13 +46662,15 @@ impl<'a, C> FloodlightActivityGroupPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47819,25 +46941,15 @@ impl<'a, C> FloodlightActivityGroupUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47845,13 +46957,15 @@ impl<'a, C> FloodlightActivityGroupUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -48093,25 +47207,15 @@ impl<'a, C> FloodlightConfigurationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -48119,13 +47223,15 @@ impl<'a, C> FloodlightConfigurationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -48373,25 +47479,15 @@ impl<'a, C> FloodlightConfigurationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -48399,13 +47495,15 @@ impl<'a, C> FloodlightConfigurationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -48667,25 +47765,15 @@ impl<'a, C> FloodlightConfigurationPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -48693,13 +47781,15 @@ impl<'a, C> FloodlightConfigurationPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -48970,25 +48060,15 @@ impl<'a, C> FloodlightConfigurationUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -48996,13 +48076,15 @@ impl<'a, C> FloodlightConfigurationUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49246,25 +48328,15 @@ impl<'a, C> InventoryItemGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -49272,13 +48344,15 @@ impl<'a, C> InventoryItemGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49582,25 +48656,15 @@ impl<'a, C> InventoryItemListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -49608,13 +48672,15 @@ impl<'a, C> InventoryItemListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49921,25 +48987,15 @@ impl<'a, C> LanguageListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -49947,13 +49003,15 @@ impl<'a, C> LanguageListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -50184,25 +49242,15 @@ impl<'a, C> MetroListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -50210,13 +49258,15 @@ impl<'a, C> MetroListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -50449,25 +49499,15 @@ impl<'a, C> MobileAppGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -50475,13 +49515,15 @@ impl<'a, C> MobileAppGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -50751,25 +49793,15 @@ impl<'a, C> MobileAppListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -50777,13 +49809,15 @@ impl<'a, C> MobileAppListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51053,25 +50087,15 @@ impl<'a, C> MobileCarrierGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51079,13 +50103,15 @@ impl<'a, C> MobileCarrierGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51326,25 +50352,15 @@ impl<'a, C> MobileCarrierListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51352,13 +50368,15 @@ impl<'a, C> MobileCarrierListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51591,25 +50609,15 @@ impl<'a, C> OperatingSystemVersionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51617,13 +50625,15 @@ impl<'a, C> OperatingSystemVersionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51864,25 +50874,15 @@ impl<'a, C> OperatingSystemVersionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51890,13 +50890,15 @@ impl<'a, C> OperatingSystemVersionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -52129,25 +51131,15 @@ impl<'a, C> OperatingSystemGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -52155,13 +51147,15 @@ impl<'a, C> OperatingSystemGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -52402,25 +51396,15 @@ impl<'a, C> OperatingSystemListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -52428,13 +51412,15 @@ impl<'a, C> OperatingSystemListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -52669,25 +51655,15 @@ impl<'a, C> OrderDocumentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -52695,13 +51671,15 @@ impl<'a, C> OrderDocumentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -53005,25 +51983,15 @@ impl<'a, C> OrderDocumentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -53031,13 +51999,15 @@ impl<'a, C> OrderDocumentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -53348,25 +52318,15 @@ impl<'a, C> OrderGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -53374,13 +52334,15 @@ impl<'a, C> OrderGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -53672,25 +52634,15 @@ impl<'a, C> OrderListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -53698,13 +52650,15 @@ impl<'a, C> OrderListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -53998,25 +52952,15 @@ impl<'a, C> PlacementGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -54024,13 +52968,15 @@ impl<'a, C> PlacementGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -54292,25 +53238,15 @@ impl<'a, C> PlacementGroupInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -54318,13 +53254,15 @@ impl<'a, C> PlacementGroupInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -54675,25 +53613,15 @@ impl<'a, C> PlacementGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -54701,13 +53629,15 @@ impl<'a, C> PlacementGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -55102,25 +54032,15 @@ impl<'a, C> PlacementGroupPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -55128,13 +54048,15 @@ impl<'a, C> PlacementGroupPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -55405,25 +54327,15 @@ impl<'a, C> PlacementGroupUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -55431,13 +54343,15 @@ impl<'a, C> PlacementGroupUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -55678,25 +54592,15 @@ impl<'a, C> PlacementStrategyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -55704,11 +54608,11 @@ impl<'a, C> PlacementStrategyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -55945,25 +54849,15 @@ impl<'a, C> PlacementStrategyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -55971,13 +54865,15 @@ impl<'a, C> PlacementStrategyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -56239,25 +55135,15 @@ impl<'a, C> PlacementStrategyInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -56265,13 +55151,15 @@ impl<'a, C> PlacementStrategyInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -56543,25 +55431,15 @@ impl<'a, C> PlacementStrategyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -56569,13 +55447,15 @@ impl<'a, C> PlacementStrategyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -56872,25 +55752,15 @@ impl<'a, C> PlacementStrategyPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -56898,13 +55768,15 @@ impl<'a, C> PlacementStrategyPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -57175,25 +56047,15 @@ impl<'a, C> PlacementStrategyUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -57201,13 +56063,15 @@ impl<'a, C> PlacementStrategyUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -57466,25 +56330,15 @@ impl<'a, C> PlacementGeneratetagCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -57492,13 +56346,15 @@ impl<'a, C> PlacementGeneratetagCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -57754,25 +56610,15 @@ impl<'a, C> PlacementGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -57780,13 +56626,15 @@ impl<'a, C> PlacementGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -58048,25 +56896,15 @@ impl<'a, C> PlacementInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -58074,13 +56912,15 @@ impl<'a, C> PlacementInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -58452,25 +57292,15 @@ impl<'a, C> PlacementListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -58478,13 +57308,15 @@ impl<'a, C> PlacementListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -58903,25 +57735,15 @@ impl<'a, C> PlacementPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -58929,13 +57751,15 @@ impl<'a, C> PlacementPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -59206,25 +58030,15 @@ impl<'a, C> PlacementUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -59232,13 +58046,15 @@ impl<'a, C> PlacementUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -59480,25 +58296,15 @@ impl<'a, C> PlatformTypeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -59506,13 +58312,15 @@ impl<'a, C> PlatformTypeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -59753,25 +58561,15 @@ impl<'a, C> PlatformTypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -59779,13 +58577,15 @@ impl<'a, C> PlatformTypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -60018,25 +58818,15 @@ impl<'a, C> PostalCodeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -60044,13 +58834,15 @@ impl<'a, C> PostalCodeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -60291,25 +59083,15 @@ impl<'a, C> PostalCodeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -60317,13 +59099,15 @@ impl<'a, C> PostalCodeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -60556,25 +59340,15 @@ impl<'a, C> ProjectGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -60582,13 +59356,15 @@ impl<'a, C> ProjectGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -60868,25 +59644,15 @@ impl<'a, C> ProjectListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -60894,13 +59660,15 @@ impl<'a, C> ProjectListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -61182,25 +59950,15 @@ impl<'a, C> RegionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -61208,13 +59966,15 @@ impl<'a, C> RegionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -61447,25 +60207,15 @@ impl<'a, C> RemarketingListShareGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -61473,13 +60223,15 @@ impl<'a, C> RemarketingListShareGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -61743,25 +60495,15 @@ impl<'a, C> RemarketingListSharePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -61769,13 +60511,15 @@ impl<'a, C> RemarketingListSharePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -62046,25 +60790,15 @@ impl<'a, C> RemarketingListShareUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -62072,13 +60806,15 @@ impl<'a, C> RemarketingListShareUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -62320,25 +61056,15 @@ impl<'a, C> RemarketingListGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -62346,13 +61072,15 @@ impl<'a, C> RemarketingListGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -62614,25 +61342,15 @@ impl<'a, C> RemarketingListInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -62640,13 +61358,15 @@ impl<'a, C> RemarketingListInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -62923,25 +61643,15 @@ impl<'a, C> RemarketingListListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -62949,13 +61659,15 @@ impl<'a, C> RemarketingListListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -63268,25 +61980,15 @@ impl<'a, C> RemarketingListPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -63294,13 +61996,15 @@ impl<'a, C> RemarketingListPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -63571,25 +62275,15 @@ impl<'a, C> RemarketingListUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -63597,13 +62291,15 @@ impl<'a, C> RemarketingListUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -63864,25 +62560,15 @@ impl<'a, C> ReportCompatibleFieldQueryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -63890,13 +62576,15 @@ impl<'a, C> ReportCompatibleFieldQueryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -64161,25 +62849,15 @@ impl<'a, C> ReportFileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -64187,19 +62865,21 @@ impl<'a, C> ReportFileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = if enable_resource_parsing { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); } } - } else { (reconstructed_result, Default::default()) }; + } else { (res, Default::default()) }; dlg.finished(true); return Ok(result_value) @@ -64466,25 +63146,15 @@ impl<'a, C> ReportFileListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -64492,13 +63162,15 @@ impl<'a, C> ReportFileListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -64768,25 +63440,15 @@ impl<'a, C> ReportDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -64794,11 +63456,11 @@ impl<'a, C> ReportDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -65035,25 +63697,15 @@ impl<'a, C> ReportGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -65061,13 +63713,15 @@ impl<'a, C> ReportGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -65329,25 +63983,15 @@ impl<'a, C> ReportInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -65355,13 +63999,15 @@ impl<'a, C> ReportInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -65626,25 +64272,15 @@ impl<'a, C> ReportListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -65652,13 +64288,15 @@ impl<'a, C> ReportListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -65947,25 +64585,15 @@ impl<'a, C> ReportPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -65973,13 +64601,15 @@ impl<'a, C> ReportPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -66236,25 +64866,15 @@ impl<'a, C> ReportRunCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -66262,13 +64882,15 @@ impl<'a, C> ReportRunCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -66539,25 +65161,15 @@ impl<'a, C> ReportUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -66565,13 +65177,15 @@ impl<'a, C> ReportUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -66823,25 +65437,15 @@ impl<'a, C> SiteGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -66849,13 +65453,15 @@ impl<'a, C> SiteGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -67117,25 +65723,15 @@ impl<'a, C> SiteInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -67143,13 +65739,15 @@ impl<'a, C> SiteInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -67470,25 +66068,15 @@ impl<'a, C> SiteListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -67496,13 +66084,15 @@ impl<'a, C> SiteListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -67864,25 +66454,15 @@ impl<'a, C> SitePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -67890,13 +66470,15 @@ impl<'a, C> SitePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -68167,25 +66749,15 @@ impl<'a, C> SiteUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -68193,13 +66765,15 @@ impl<'a, C> SiteUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -68441,25 +67015,15 @@ impl<'a, C> SizeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -68467,13 +67031,15 @@ impl<'a, C> SizeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -68735,25 +67301,15 @@ impl<'a, C> SizeInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -68761,13 +67317,15 @@ impl<'a, C> SizeInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -69029,25 +67587,15 @@ impl<'a, C> SizeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -69055,13 +67603,15 @@ impl<'a, C> SizeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -69323,25 +67873,15 @@ impl<'a, C> SubaccountGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -69349,13 +67889,15 @@ impl<'a, C> SubaccountGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -69617,25 +68159,15 @@ impl<'a, C> SubaccountInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -69643,13 +68175,15 @@ impl<'a, C> SubaccountInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -69921,25 +68455,15 @@ impl<'a, C> SubaccountListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -69947,13 +68471,15 @@ impl<'a, C> SubaccountListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -70250,25 +68776,15 @@ impl<'a, C> SubaccountPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -70276,13 +68792,15 @@ impl<'a, C> SubaccountPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -70553,25 +69071,15 @@ impl<'a, C> SubaccountUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -70579,13 +69087,15 @@ impl<'a, C> SubaccountUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -70827,25 +69337,15 @@ impl<'a, C> TargetableRemarketingListGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -70853,13 +69353,15 @@ impl<'a, C> TargetableRemarketingListGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -71132,25 +69634,15 @@ impl<'a, C> TargetableRemarketingListListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -71158,13 +69650,15 @@ impl<'a, C> TargetableRemarketingListListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -71449,25 +69943,15 @@ impl<'a, C> TargetingTemplateGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -71475,13 +69959,15 @@ impl<'a, C> TargetingTemplateGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -71743,25 +70229,15 @@ impl<'a, C> TargetingTemplateInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -71769,13 +70245,15 @@ impl<'a, C> TargetingTemplateInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -72052,25 +70530,15 @@ impl<'a, C> TargetingTemplateListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -72078,13 +70546,15 @@ impl<'a, C> TargetingTemplateListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -72388,25 +70858,15 @@ impl<'a, C> TargetingTemplatePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -72414,13 +70874,15 @@ impl<'a, C> TargetingTemplatePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -72691,25 +71153,15 @@ impl<'a, C> TargetingTemplateUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -72717,13 +71169,15 @@ impl<'a, C> TargetingTemplateUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -72963,25 +71417,15 @@ impl<'a, C> UserProfileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -72989,13 +71433,15 @@ impl<'a, C> UserProfileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -73203,25 +71649,15 @@ impl<'a, C> UserProfileListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -73229,13 +71665,15 @@ impl<'a, C> UserProfileListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -73458,25 +71896,15 @@ impl<'a, C> UserRolePermissionGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -73484,13 +71912,15 @@ impl<'a, C> UserRolePermissionGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -73731,25 +72161,15 @@ impl<'a, C> UserRolePermissionGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -73757,13 +72177,15 @@ impl<'a, C> UserRolePermissionGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -73996,25 +72418,15 @@ impl<'a, C> UserRolePermissionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -74022,13 +72434,15 @@ impl<'a, C> UserRolePermissionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -74276,25 +72690,15 @@ impl<'a, C> UserRolePermissionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -74302,13 +72706,15 @@ impl<'a, C> UserRolePermissionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -74548,25 +72954,15 @@ impl<'a, C> UserRoleDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -74574,11 +72970,11 @@ impl<'a, C> UserRoleDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -74815,25 +73211,15 @@ impl<'a, C> UserRoleGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -74841,13 +73227,15 @@ impl<'a, C> UserRoleGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -75109,25 +73497,15 @@ impl<'a, C> UserRoleInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -75135,13 +73513,15 @@ impl<'a, C> UserRoleInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -75423,25 +73803,15 @@ impl<'a, C> UserRoleListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -75449,13 +73819,15 @@ impl<'a, C> UserRoleListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -75766,25 +74138,15 @@ impl<'a, C> UserRolePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -75792,13 +74154,15 @@ impl<'a, C> UserRolePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -76069,25 +74433,15 @@ impl<'a, C> UserRoleUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -76095,13 +74449,15 @@ impl<'a, C> UserRoleUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -76343,25 +74699,15 @@ impl<'a, C> VideoFormatGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -76369,13 +74715,15 @@ impl<'a, C> VideoFormatGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -76616,25 +74964,15 @@ impl<'a, C> VideoFormatListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -76642,13 +74980,15 @@ impl<'a, C> VideoFormatListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/dfareporting3d4/src/client.rs b/gen/dfareporting3d4/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/dfareporting3d4/src/client.rs +++ b/gen/dfareporting3d4/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/dialogflow2-cli/src/main.rs b/gen/dialogflow2-cli/src/main.rs index 17354c4531..594cc21bcf 100644 --- a/gen/dialogflow2-cli/src/main.rs +++ b/gen/dialogflow2-cli/src/main.rs @@ -861,7 +861,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["language-code", "page-size", "intent-view", "page-token"].iter().map(|v|*v)); + v.extend(["intent-view", "language-code", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2320,7 +2320,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["language-code", "intent-view"].iter().map(|v|*v)); + v.extend(["intent-view", "language-code"].iter().map(|v|*v)); v } )); } } @@ -2431,7 +2431,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["language-code", "intent-view"].iter().map(|v|*v)); + v.extend(["intent-view", "language-code"].iter().map(|v|*v)); v } )); } } @@ -2496,7 +2496,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["language-code", "page-size", "intent-view", "page-token"].iter().map(|v|*v)); + v.extend(["intent-view", "language-code", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2605,7 +2605,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["language-code", "update-mask", "intent-view"].iter().map(|v|*v)); + v.extend(["intent-view", "language-code", "update-mask"].iter().map(|v|*v)); v } )); } } @@ -4622,7 +4622,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -5405,7 +5405,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -5467,7 +5467,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -9169,7 +9169,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["language-code", "intent-view"].iter().map(|v|*v)); + v.extend(["intent-view", "language-code"].iter().map(|v|*v)); v } )); } } @@ -9280,7 +9280,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["language-code", "intent-view"].iter().map(|v|*v)); + v.extend(["intent-view", "language-code"].iter().map(|v|*v)); v } )); } } @@ -9345,7 +9345,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["language-code", "page-size", "intent-view", "page-token"].iter().map(|v|*v)); + v.extend(["intent-view", "language-code", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -9454,7 +9454,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["language-code", "update-mask", "intent-view"].iter().map(|v|*v)); + v.extend(["intent-view", "language-code", "update-mask"].iter().map(|v|*v)); v } )); } } @@ -10684,7 +10684,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -11467,7 +11467,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -11529,7 +11529,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -13150,7 +13150,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -13416,7 +13416,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/dialogflow2/src/api.rs b/gen/dialogflow2/src/api.rs index 12d6b32f7a..0019dcba48 100644 --- a/gen/dialogflow2/src/api.rs +++ b/gen/dialogflow2/src/api.rs @@ -6936,25 +6936,15 @@ impl<'a, C> ProjectAgentEntityTypeEntityBatchCreateCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6962,13 +6952,15 @@ impl<'a, C> ProjectAgentEntityTypeEntityBatchCreateCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7233,25 +7225,15 @@ impl<'a, C> ProjectAgentEntityTypeEntityBatchDeleteCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7259,13 +7241,15 @@ impl<'a, C> ProjectAgentEntityTypeEntityBatchDeleteCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7530,25 +7514,15 @@ impl<'a, C> ProjectAgentEntityTypeEntityBatchUpdateCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7556,13 +7530,15 @@ impl<'a, C> ProjectAgentEntityTypeEntityBatchUpdateCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7827,25 +7803,15 @@ impl<'a, C> ProjectAgentEntityTypeBatchDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7853,13 +7819,15 @@ impl<'a, C> ProjectAgentEntityTypeBatchDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8124,25 +8092,15 @@ impl<'a, C> ProjectAgentEntityTypeBatchUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8150,13 +8108,15 @@ impl<'a, C> ProjectAgentEntityTypeBatchUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8426,25 +8386,15 @@ impl<'a, C> ProjectAgentEntityTypeCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8452,13 +8402,15 @@ impl<'a, C> ProjectAgentEntityTypeCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8709,25 +8661,15 @@ impl<'a, C> ProjectAgentEntityTypeDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8735,13 +8677,15 @@ impl<'a, C> ProjectAgentEntityTypeDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8981,25 +8925,15 @@ impl<'a, C> ProjectAgentEntityTypeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9007,13 +8941,15 @@ impl<'a, C> ProjectAgentEntityTypeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9270,25 +9206,15 @@ impl<'a, C> ProjectAgentEntityTypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9296,13 +9222,15 @@ impl<'a, C> ProjectAgentEntityTypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9589,25 +9517,15 @@ impl<'a, C> ProjectAgentEntityTypePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9615,13 +9533,15 @@ impl<'a, C> ProjectAgentEntityTypePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9899,25 +9819,15 @@ impl<'a, C> ProjectAgentEnvironmentIntentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9925,13 +9835,15 @@ impl<'a, C> ProjectAgentEnvironmentIntentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10215,25 +10127,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionContextCreateCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10241,13 +10143,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionContextCreateCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10491,25 +10395,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionContextDeleteCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10517,13 +10411,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionContextDeleteCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10758,25 +10654,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionContextGetCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10784,13 +10670,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionContextGetCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11035,25 +10923,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionContextListCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11061,13 +10939,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionContextListCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11342,25 +11222,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionContextPatchCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11368,13 +11238,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionContextPatchCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11646,25 +11518,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionEntityTypeCreateCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11672,13 +11534,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionEntityTypeCreateCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11922,25 +11786,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionEntityTypeDeleteCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11948,13 +11802,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionEntityTypeDeleteCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12189,25 +12045,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionEntityTypeGetCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12215,13 +12061,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionEntityTypeGetCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12466,25 +12314,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionEntityTypeListCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12492,13 +12330,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionEntityTypeListCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12773,25 +12613,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionEntityTypePatchCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12799,13 +12629,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionEntityTypePatchCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13056,25 +12888,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionDeleteContextCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13082,13 +12904,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionDeleteContextCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13344,25 +13168,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionDetectIntentCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13370,13 +13184,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionDetectIntentCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13630,25 +13446,15 @@ impl<'a, C> ProjectAgentEnvironmentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13656,13 +13462,15 @@ impl<'a, C> ProjectAgentEnvironmentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13932,25 +13740,15 @@ impl<'a, C> ProjectAgentIntentBatchDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13958,13 +13756,15 @@ impl<'a, C> ProjectAgentIntentBatchDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14229,25 +14029,15 @@ impl<'a, C> ProjectAgentIntentBatchUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14255,13 +14045,15 @@ impl<'a, C> ProjectAgentIntentBatchUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14536,25 +14328,15 @@ impl<'a, C> ProjectAgentIntentCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14562,13 +14344,15 @@ impl<'a, C> ProjectAgentIntentCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14826,25 +14610,15 @@ impl<'a, C> ProjectAgentIntentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14852,13 +14626,15 @@ impl<'a, C> ProjectAgentIntentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15103,25 +14879,15 @@ impl<'a, C> ProjectAgentIntentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15129,13 +14895,15 @@ impl<'a, C> ProjectAgentIntentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15404,25 +15172,15 @@ impl<'a, C> ProjectAgentIntentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15430,13 +15188,15 @@ impl<'a, C> ProjectAgentIntentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15735,25 +15495,15 @@ impl<'a, C> ProjectAgentIntentPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15761,13 +15511,15 @@ impl<'a, C> ProjectAgentIntentPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16053,25 +15805,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseDocumentCreateCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16079,13 +15821,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseDocumentCreateCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16329,25 +16073,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseDocumentDeleteCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16355,13 +16089,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseDocumentDeleteCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16596,25 +16332,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseDocumentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16622,13 +16348,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseDocumentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16873,25 +16601,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseDocumentListCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16899,13 +16617,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseDocumentListCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17180,25 +16900,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseDocumentPatchCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17206,13 +16916,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseDocumentPatchCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17484,25 +17196,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseDocumentReloadCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17510,13 +17212,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseDocumentReloadCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17781,25 +17485,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17807,13 +17501,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18062,25 +17758,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18088,13 +17774,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18336,25 +18024,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18362,13 +18040,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18613,25 +18293,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18639,13 +18309,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18920,25 +18592,15 @@ impl<'a, C> ProjectAgentKnowledgeBasePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18946,13 +18608,15 @@ impl<'a, C> ProjectAgentKnowledgeBasePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19224,25 +18888,15 @@ impl<'a, C> ProjectAgentSessionContextCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19250,13 +18904,15 @@ impl<'a, C> ProjectAgentSessionContextCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19500,25 +19156,15 @@ impl<'a, C> ProjectAgentSessionContextDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19526,13 +19172,15 @@ impl<'a, C> ProjectAgentSessionContextDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19767,25 +19415,15 @@ impl<'a, C> ProjectAgentSessionContextGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19793,13 +19431,15 @@ impl<'a, C> ProjectAgentSessionContextGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20044,25 +19684,15 @@ impl<'a, C> ProjectAgentSessionContextListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20070,13 +19700,15 @@ impl<'a, C> ProjectAgentSessionContextListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20351,25 +19983,15 @@ impl<'a, C> ProjectAgentSessionContextPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20377,13 +19999,15 @@ impl<'a, C> ProjectAgentSessionContextPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20655,25 +20279,15 @@ impl<'a, C> ProjectAgentSessionEntityTypeCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20681,13 +20295,15 @@ impl<'a, C> ProjectAgentSessionEntityTypeCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20931,25 +20547,15 @@ impl<'a, C> ProjectAgentSessionEntityTypeDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20957,13 +20563,15 @@ impl<'a, C> ProjectAgentSessionEntityTypeDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21198,25 +20806,15 @@ impl<'a, C> ProjectAgentSessionEntityTypeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21224,13 +20822,15 @@ impl<'a, C> ProjectAgentSessionEntityTypeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21475,25 +21075,15 @@ impl<'a, C> ProjectAgentSessionEntityTypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21501,13 +21091,15 @@ impl<'a, C> ProjectAgentSessionEntityTypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21782,25 +21374,15 @@ impl<'a, C> ProjectAgentSessionEntityTypePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21808,13 +21390,15 @@ impl<'a, C> ProjectAgentSessionEntityTypePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22065,25 +21649,15 @@ impl<'a, C> ProjectAgentSessionDeleteContextCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22091,13 +21665,15 @@ impl<'a, C> ProjectAgentSessionDeleteContextCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22353,25 +21929,15 @@ impl<'a, C> ProjectAgentSessionDetectIntentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22379,13 +21945,15 @@ impl<'a, C> ProjectAgentSessionDetectIntentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22650,25 +22218,15 @@ impl<'a, C> ProjectAgentExportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22676,13 +22234,15 @@ impl<'a, C> ProjectAgentExportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22926,25 +22486,15 @@ impl<'a, C> ProjectAgentGetFulfillmentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22952,13 +22502,15 @@ impl<'a, C> ProjectAgentGetFulfillmentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23198,25 +22750,15 @@ impl<'a, C> ProjectAgentGetValidationResultCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23224,13 +22766,15 @@ impl<'a, C> ProjectAgentGetValidationResultCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23493,25 +23037,15 @@ impl<'a, C> ProjectAgentImportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23519,13 +23053,15 @@ impl<'a, C> ProjectAgentImportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23790,25 +23326,15 @@ impl<'a, C> ProjectAgentRestoreCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23816,13 +23342,15 @@ impl<'a, C> ProjectAgentRestoreCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24076,25 +23604,15 @@ impl<'a, C> ProjectAgentSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24102,13 +23620,15 @@ impl<'a, C> ProjectAgentSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24378,25 +23898,15 @@ impl<'a, C> ProjectAgentTrainCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24404,13 +23914,15 @@ impl<'a, C> ProjectAgentTrainCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24680,25 +24192,15 @@ impl<'a, C> ProjectAgentUpdateFulfillmentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24706,13 +24208,15 @@ impl<'a, C> ProjectAgentUpdateFulfillmentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24978,25 +24482,15 @@ impl<'a, C> ProjectAnswerRecordListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25004,13 +24498,15 @@ impl<'a, C> ProjectAnswerRecordListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25292,25 +24788,15 @@ impl<'a, C> ProjectAnswerRecordPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25318,13 +24804,15 @@ impl<'a, C> ProjectAnswerRecordPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25596,25 +25084,15 @@ impl<'a, C> ProjectConversationProfileCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25622,13 +25100,15 @@ impl<'a, C> ProjectConversationProfileCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25872,25 +25352,15 @@ impl<'a, C> ProjectConversationProfileDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25898,13 +25368,15 @@ impl<'a, C> ProjectConversationProfileDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26139,25 +25611,15 @@ impl<'a, C> ProjectConversationProfileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26165,13 +25627,15 @@ impl<'a, C> ProjectConversationProfileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26416,25 +25880,15 @@ impl<'a, C> ProjectConversationProfileListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26442,13 +25896,15 @@ impl<'a, C> ProjectConversationProfileListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26723,25 +26179,15 @@ impl<'a, C> ProjectConversationProfilePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26749,13 +26195,15 @@ impl<'a, C> ProjectConversationProfilePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27021,25 +26469,15 @@ impl<'a, C> ProjectConversationMessageListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27047,13 +26485,15 @@ impl<'a, C> ProjectConversationMessageListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27330,25 +26770,15 @@ impl<'a, C> ProjectConversationParticipantSuggestionSuggestArticleCall<'a, C> wh return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27356,13 +26786,15 @@ impl<'a, C> ProjectConversationParticipantSuggestionSuggestArticleCall<'a, C> wh } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27627,25 +27059,15 @@ impl<'a, C> ProjectConversationParticipantSuggestionSuggestFaqAnswerCall<'a, C> return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27653,13 +27075,15 @@ impl<'a, C> ProjectConversationParticipantSuggestionSuggestFaqAnswerCall<'a, C> } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27924,25 +27348,15 @@ impl<'a, C> ProjectConversationParticipantAnalyzeContentCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27950,13 +27364,15 @@ impl<'a, C> ProjectConversationParticipantAnalyzeContentCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28221,25 +27637,15 @@ impl<'a, C> ProjectConversationParticipantCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28247,13 +27653,15 @@ impl<'a, C> ProjectConversationParticipantCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28497,25 +27905,15 @@ impl<'a, C> ProjectConversationParticipantGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28523,13 +27921,15 @@ impl<'a, C> ProjectConversationParticipantGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28774,25 +28174,15 @@ impl<'a, C> ProjectConversationParticipantListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28800,13 +28190,15 @@ impl<'a, C> ProjectConversationParticipantListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29081,25 +28473,15 @@ impl<'a, C> ProjectConversationParticipantPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29107,13 +28489,15 @@ impl<'a, C> ProjectConversationParticipantPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29385,25 +28769,15 @@ impl<'a, C> ProjectConversationCompleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29411,13 +28785,15 @@ impl<'a, C> ProjectConversationCompleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29687,25 +29063,15 @@ impl<'a, C> ProjectConversationCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29713,13 +29079,15 @@ impl<'a, C> ProjectConversationCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29970,25 +29338,15 @@ impl<'a, C> ProjectConversationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29996,13 +29354,15 @@ impl<'a, C> ProjectConversationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30252,25 +29612,15 @@ impl<'a, C> ProjectConversationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30278,13 +29628,15 @@ impl<'a, C> ProjectConversationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30561,25 +29913,15 @@ impl<'a, C> ProjectKnowledgeBaseDocumentCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30587,13 +29929,15 @@ impl<'a, C> ProjectKnowledgeBaseDocumentCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30837,25 +30181,15 @@ impl<'a, C> ProjectKnowledgeBaseDocumentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30863,13 +30197,15 @@ impl<'a, C> ProjectKnowledgeBaseDocumentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31104,25 +30440,15 @@ impl<'a, C> ProjectKnowledgeBaseDocumentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31130,13 +30456,15 @@ impl<'a, C> ProjectKnowledgeBaseDocumentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31381,25 +30709,15 @@ impl<'a, C> ProjectKnowledgeBaseDocumentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31407,13 +30725,15 @@ impl<'a, C> ProjectKnowledgeBaseDocumentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31688,25 +31008,15 @@ impl<'a, C> ProjectKnowledgeBaseDocumentPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31714,13 +31024,15 @@ impl<'a, C> ProjectKnowledgeBaseDocumentPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31992,25 +31304,15 @@ impl<'a, C> ProjectKnowledgeBaseDocumentReloadCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32018,13 +31320,15 @@ impl<'a, C> ProjectKnowledgeBaseDocumentReloadCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32289,25 +31593,15 @@ impl<'a, C> ProjectKnowledgeBaseCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32315,13 +31609,15 @@ impl<'a, C> ProjectKnowledgeBaseCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32570,25 +31866,15 @@ impl<'a, C> ProjectKnowledgeBaseDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32596,13 +31882,15 @@ impl<'a, C> ProjectKnowledgeBaseDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32844,25 +32132,15 @@ impl<'a, C> ProjectKnowledgeBaseGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32870,13 +32148,15 @@ impl<'a, C> ProjectKnowledgeBaseGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33121,25 +32401,15 @@ impl<'a, C> ProjectKnowledgeBaseListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33147,13 +32417,15 @@ impl<'a, C> ProjectKnowledgeBaseListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33428,25 +32700,15 @@ impl<'a, C> ProjectKnowledgeBasePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33454,13 +32716,15 @@ impl<'a, C> ProjectKnowledgeBasePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33732,25 +32996,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeEntityBatchCreateCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33758,13 +33012,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeEntityBatchCreateCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34029,25 +33285,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeEntityBatchDeleteCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34055,13 +33301,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeEntityBatchDeleteCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34326,25 +33574,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeEntityBatchUpdateCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34352,13 +33590,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeEntityBatchUpdateCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34623,25 +33863,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeBatchDeleteCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34649,13 +33879,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeBatchDeleteCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34920,25 +34152,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeBatchUpdateCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34946,13 +34168,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeBatchUpdateCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35222,25 +34446,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35248,13 +34462,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35505,25 +34721,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35531,13 +34737,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35777,25 +34985,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35803,13 +35001,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36066,25 +35266,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36092,13 +35282,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36385,25 +35577,15 @@ impl<'a, C> ProjectLocationAgentEntityTypePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36411,13 +35593,15 @@ impl<'a, C> ProjectLocationAgentEntityTypePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36696,25 +35880,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionContextCreateCall<'a, C> w return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36722,13 +35896,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionContextCreateCall<'a, C> w } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36972,25 +36148,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionContextDeleteCall<'a, C> w return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36998,13 +36164,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionContextDeleteCall<'a, C> w } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37239,25 +36407,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionContextGetCall<'a, C> wher return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37265,13 +36423,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionContextGetCall<'a, C> wher } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37516,25 +36676,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionContextListCall<'a, C> whe return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37542,13 +36692,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionContextListCall<'a, C> whe } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37823,25 +36975,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionContextPatchCall<'a, C> wh return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37849,13 +36991,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionContextPatchCall<'a, C> wh } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38127,25 +37271,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionEntityTypeCreateCall<'a, C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38153,13 +37287,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionEntityTypeCreateCall<'a, C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38403,25 +37539,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionEntityTypeDeleteCall<'a, C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38429,13 +37555,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionEntityTypeDeleteCall<'a, C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38670,25 +37798,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionEntityTypeGetCall<'a, C> w return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38696,13 +37814,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionEntityTypeGetCall<'a, C> w } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38947,25 +38067,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionEntityTypeListCall<'a, C> return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38973,13 +38083,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionEntityTypeListCall<'a, C> } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39254,25 +38366,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionEntityTypePatchCall<'a, C> return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39280,13 +38382,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionEntityTypePatchCall<'a, C> } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39537,25 +38641,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionDeleteContextCall<'a, C> w return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39563,13 +38657,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionDeleteContextCall<'a, C> w } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39825,25 +38921,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionDetectIntentCall<'a, C> wh return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39851,13 +38937,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionDetectIntentCall<'a, C> wh } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40111,25 +39199,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40137,13 +39215,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40413,25 +39493,15 @@ impl<'a, C> ProjectLocationAgentIntentBatchDeleteCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40439,13 +39509,15 @@ impl<'a, C> ProjectLocationAgentIntentBatchDeleteCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40710,25 +39782,15 @@ impl<'a, C> ProjectLocationAgentIntentBatchUpdateCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40736,13 +39798,15 @@ impl<'a, C> ProjectLocationAgentIntentBatchUpdateCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41017,25 +40081,15 @@ impl<'a, C> ProjectLocationAgentIntentCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41043,13 +40097,15 @@ impl<'a, C> ProjectLocationAgentIntentCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41307,25 +40363,15 @@ impl<'a, C> ProjectLocationAgentIntentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41333,13 +40379,15 @@ impl<'a, C> ProjectLocationAgentIntentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41584,25 +40632,15 @@ impl<'a, C> ProjectLocationAgentIntentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41610,13 +40648,15 @@ impl<'a, C> ProjectLocationAgentIntentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41885,25 +40925,15 @@ impl<'a, C> ProjectLocationAgentIntentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41911,13 +40941,15 @@ impl<'a, C> ProjectLocationAgentIntentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42216,25 +41248,15 @@ impl<'a, C> ProjectLocationAgentIntentPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42242,13 +41264,15 @@ impl<'a, C> ProjectLocationAgentIntentPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42534,25 +41558,15 @@ impl<'a, C> ProjectLocationAgentSessionContextCreateCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42560,13 +41574,15 @@ impl<'a, C> ProjectLocationAgentSessionContextCreateCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42810,25 +41826,15 @@ impl<'a, C> ProjectLocationAgentSessionContextDeleteCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42836,13 +41842,15 @@ impl<'a, C> ProjectLocationAgentSessionContextDeleteCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43077,25 +42085,15 @@ impl<'a, C> ProjectLocationAgentSessionContextGetCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43103,13 +42101,15 @@ impl<'a, C> ProjectLocationAgentSessionContextGetCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43354,25 +42354,15 @@ impl<'a, C> ProjectLocationAgentSessionContextListCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43380,13 +42370,15 @@ impl<'a, C> ProjectLocationAgentSessionContextListCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43661,25 +42653,15 @@ impl<'a, C> ProjectLocationAgentSessionContextPatchCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43687,13 +42669,15 @@ impl<'a, C> ProjectLocationAgentSessionContextPatchCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43965,25 +42949,15 @@ impl<'a, C> ProjectLocationAgentSessionEntityTypeCreateCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43991,13 +42965,15 @@ impl<'a, C> ProjectLocationAgentSessionEntityTypeCreateCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44241,25 +43217,15 @@ impl<'a, C> ProjectLocationAgentSessionEntityTypeDeleteCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44267,13 +43233,15 @@ impl<'a, C> ProjectLocationAgentSessionEntityTypeDeleteCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44508,25 +43476,15 @@ impl<'a, C> ProjectLocationAgentSessionEntityTypeGetCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44534,13 +43492,15 @@ impl<'a, C> ProjectLocationAgentSessionEntityTypeGetCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44785,25 +43745,15 @@ impl<'a, C> ProjectLocationAgentSessionEntityTypeListCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44811,13 +43761,15 @@ impl<'a, C> ProjectLocationAgentSessionEntityTypeListCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45092,25 +44044,15 @@ impl<'a, C> ProjectLocationAgentSessionEntityTypePatchCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45118,13 +44060,15 @@ impl<'a, C> ProjectLocationAgentSessionEntityTypePatchCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45375,25 +44319,15 @@ impl<'a, C> ProjectLocationAgentSessionDeleteContextCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45401,13 +44335,15 @@ impl<'a, C> ProjectLocationAgentSessionDeleteContextCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45663,25 +44599,15 @@ impl<'a, C> ProjectLocationAgentSessionDetectIntentCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45689,13 +44615,15 @@ impl<'a, C> ProjectLocationAgentSessionDetectIntentCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45960,25 +44888,15 @@ impl<'a, C> ProjectLocationAgentExportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45986,13 +44904,15 @@ impl<'a, C> ProjectLocationAgentExportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46236,25 +45156,15 @@ impl<'a, C> ProjectLocationAgentGetFulfillmentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46262,13 +45172,15 @@ impl<'a, C> ProjectLocationAgentGetFulfillmentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46508,25 +45420,15 @@ impl<'a, C> ProjectLocationAgentGetValidationResultCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46534,13 +45436,15 @@ impl<'a, C> ProjectLocationAgentGetValidationResultCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46803,25 +45707,15 @@ impl<'a, C> ProjectLocationAgentImportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46829,13 +45723,15 @@ impl<'a, C> ProjectLocationAgentImportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47100,25 +45996,15 @@ impl<'a, C> ProjectLocationAgentRestoreCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47126,13 +46012,15 @@ impl<'a, C> ProjectLocationAgentRestoreCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47386,25 +46274,15 @@ impl<'a, C> ProjectLocationAgentSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47412,13 +46290,15 @@ impl<'a, C> ProjectLocationAgentSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47688,25 +46568,15 @@ impl<'a, C> ProjectLocationAgentTrainCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47714,13 +46584,15 @@ impl<'a, C> ProjectLocationAgentTrainCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47990,25 +46862,15 @@ impl<'a, C> ProjectLocationAgentUpdateFulfillmentCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -48016,13 +46878,15 @@ impl<'a, C> ProjectLocationAgentUpdateFulfillmentCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -48288,25 +47152,15 @@ impl<'a, C> ProjectLocationAnswerRecordListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -48314,13 +47168,15 @@ impl<'a, C> ProjectLocationAnswerRecordListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -48602,25 +47458,15 @@ impl<'a, C> ProjectLocationAnswerRecordPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -48628,13 +47474,15 @@ impl<'a, C> ProjectLocationAnswerRecordPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -48906,25 +47754,15 @@ impl<'a, C> ProjectLocationConversationProfileCreateCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -48932,13 +47770,15 @@ impl<'a, C> ProjectLocationConversationProfileCreateCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49182,25 +48022,15 @@ impl<'a, C> ProjectLocationConversationProfileDeleteCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -49208,13 +48038,15 @@ impl<'a, C> ProjectLocationConversationProfileDeleteCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49449,25 +48281,15 @@ impl<'a, C> ProjectLocationConversationProfileGetCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -49475,13 +48297,15 @@ impl<'a, C> ProjectLocationConversationProfileGetCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49726,25 +48550,15 @@ impl<'a, C> ProjectLocationConversationProfileListCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -49752,13 +48566,15 @@ impl<'a, C> ProjectLocationConversationProfileListCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -50033,25 +48849,15 @@ impl<'a, C> ProjectLocationConversationProfilePatchCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -50059,13 +48865,15 @@ impl<'a, C> ProjectLocationConversationProfilePatchCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -50331,25 +49139,15 @@ impl<'a, C> ProjectLocationConversationMessageListCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -50357,13 +49155,15 @@ impl<'a, C> ProjectLocationConversationMessageListCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -50640,25 +49440,15 @@ impl<'a, C> ProjectLocationConversationParticipantSuggestionSuggestArticleCall<' return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -50666,13 +49456,15 @@ impl<'a, C> ProjectLocationConversationParticipantSuggestionSuggestArticleCall<' } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -50937,25 +49729,15 @@ impl<'a, C> ProjectLocationConversationParticipantSuggestionSuggestFaqAnswerCall return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -50963,13 +49745,15 @@ impl<'a, C> ProjectLocationConversationParticipantSuggestionSuggestFaqAnswerCall } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51234,25 +50018,15 @@ impl<'a, C> ProjectLocationConversationParticipantAnalyzeContentCall<'a, C> wher return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51260,13 +50034,15 @@ impl<'a, C> ProjectLocationConversationParticipantAnalyzeContentCall<'a, C> wher } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51531,25 +50307,15 @@ impl<'a, C> ProjectLocationConversationParticipantCreateCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51557,13 +50323,15 @@ impl<'a, C> ProjectLocationConversationParticipantCreateCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51807,25 +50575,15 @@ impl<'a, C> ProjectLocationConversationParticipantGetCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51833,13 +50591,15 @@ impl<'a, C> ProjectLocationConversationParticipantGetCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -52084,25 +50844,15 @@ impl<'a, C> ProjectLocationConversationParticipantListCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -52110,13 +50860,15 @@ impl<'a, C> ProjectLocationConversationParticipantListCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -52391,25 +51143,15 @@ impl<'a, C> ProjectLocationConversationParticipantPatchCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -52417,13 +51159,15 @@ impl<'a, C> ProjectLocationConversationParticipantPatchCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -52695,25 +51439,15 @@ impl<'a, C> ProjectLocationConversationCompleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -52721,13 +51455,15 @@ impl<'a, C> ProjectLocationConversationCompleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -52997,25 +51733,15 @@ impl<'a, C> ProjectLocationConversationCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -53023,13 +51749,15 @@ impl<'a, C> ProjectLocationConversationCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -53280,25 +52008,15 @@ impl<'a, C> ProjectLocationConversationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -53306,13 +52024,15 @@ impl<'a, C> ProjectLocationConversationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -53562,25 +52282,15 @@ impl<'a, C> ProjectLocationConversationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -53588,13 +52298,15 @@ impl<'a, C> ProjectLocationConversationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -53871,25 +52583,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseDocumentCreateCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -53897,13 +52599,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseDocumentCreateCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -54147,25 +52851,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseDocumentDeleteCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -54173,13 +52867,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseDocumentDeleteCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -54414,25 +53110,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseDocumentGetCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -54440,13 +53126,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseDocumentGetCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -54691,25 +53379,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseDocumentListCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -54717,13 +53395,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseDocumentListCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -54998,25 +53678,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseDocumentPatchCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -55024,13 +53694,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseDocumentPatchCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -55302,25 +53974,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseDocumentReloadCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -55328,13 +53990,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseDocumentReloadCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -55599,25 +54263,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -55625,13 +54279,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -55880,25 +54536,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -55906,13 +54552,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -56154,25 +54802,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -56180,13 +54818,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -56431,25 +55071,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -56457,13 +55087,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -56738,25 +55370,15 @@ impl<'a, C> ProjectLocationKnowledgeBasePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -56764,13 +55386,15 @@ impl<'a, C> ProjectLocationKnowledgeBasePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -57021,25 +55645,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -57047,13 +55661,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -57288,25 +55904,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -57314,13 +55920,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -57570,25 +56178,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -57596,13 +56194,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -57858,25 +56458,15 @@ impl<'a, C> ProjectLocationDeleteAgentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -57884,13 +56474,15 @@ impl<'a, C> ProjectLocationDeleteAgentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -58125,25 +56717,15 @@ impl<'a, C> ProjectLocationGetAgentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -58151,13 +56733,15 @@ impl<'a, C> ProjectLocationGetAgentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -58418,25 +57002,15 @@ impl<'a, C> ProjectLocationSetAgentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -58444,13 +57018,15 @@ impl<'a, C> ProjectLocationSetAgentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -58701,25 +57277,15 @@ impl<'a, C> ProjectOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -58727,13 +57293,15 @@ impl<'a, C> ProjectOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -58968,25 +57536,15 @@ impl<'a, C> ProjectOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -58994,13 +57552,15 @@ impl<'a, C> ProjectOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -59250,25 +57810,15 @@ impl<'a, C> ProjectOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -59276,13 +57826,15 @@ impl<'a, C> ProjectOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -59538,25 +58090,15 @@ impl<'a, C> ProjectDeleteAgentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -59564,13 +58106,15 @@ impl<'a, C> ProjectDeleteAgentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -59805,25 +58349,15 @@ impl<'a, C> ProjectGetAgentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -59831,13 +58365,15 @@ impl<'a, C> ProjectGetAgentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -60098,25 +58634,15 @@ impl<'a, C> ProjectSetAgentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -60124,13 +58650,15 @@ impl<'a, C> ProjectSetAgentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/dialogflow2/src/client.rs b/gen/dialogflow2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/dialogflow2/src/client.rs +++ b/gen/dialogflow2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/dialogflow2_beta1-cli/src/main.rs b/gen/dialogflow2_beta1-cli/src/main.rs index cb644e9e0d..f9fac1a58c 100644 --- a/gen/dialogflow2_beta1-cli/src/main.rs +++ b/gen/dialogflow2_beta1-cli/src/main.rs @@ -700,7 +700,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "language-code", "page-token"].iter().map(|v|*v)); + v.extend(["language-code", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -861,7 +861,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "language-code", "intent-view", "page-token"].iter().map(|v|*v)); + v.extend(["intent-view", "language-code", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2323,7 +2323,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["language-code", "intent-view"].iter().map(|v|*v)); + v.extend(["intent-view", "language-code"].iter().map(|v|*v)); v } )); } } @@ -2434,7 +2434,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["language-code", "intent-view"].iter().map(|v|*v)); + v.extend(["intent-view", "language-code"].iter().map(|v|*v)); v } )); } } @@ -2499,7 +2499,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "language-code", "intent-view", "page-token"].iter().map(|v|*v)); + v.extend(["intent-view", "language-code", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3018,7 +3018,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3318,7 +3318,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -5475,7 +5475,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -5621,7 +5621,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -6163,7 +6163,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -7025,7 +7025,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -7325,7 +7325,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -8108,7 +8108,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "language-code", "page-token"].iter().map(|v|*v)); + v.extend(["language-code", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -9666,7 +9666,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["language-code", "intent-view"].iter().map(|v|*v)); + v.extend(["intent-view", "language-code"].iter().map(|v|*v)); v } )); } } @@ -9777,7 +9777,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["language-code", "intent-view"].iter().map(|v|*v)); + v.extend(["intent-view", "language-code"].iter().map(|v|*v)); v } )); } } @@ -9842,7 +9842,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "language-code", "intent-view", "page-token"].iter().map(|v|*v)); + v.extend(["intent-view", "language-code", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -12018,7 +12018,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -12164,7 +12164,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -13420,7 +13420,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -13720,7 +13720,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -13977,7 +13977,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -14243,7 +14243,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/dialogflow2_beta1/src/api.rs b/gen/dialogflow2_beta1/src/api.rs index 3c9b81c10d..b37edf01c0 100644 --- a/gen/dialogflow2_beta1/src/api.rs +++ b/gen/dialogflow2_beta1/src/api.rs @@ -7897,25 +7897,15 @@ impl<'a, C> ProjectAgentEntityTypeEntityBatchCreateCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7923,13 +7913,15 @@ impl<'a, C> ProjectAgentEntityTypeEntityBatchCreateCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8194,25 +8186,15 @@ impl<'a, C> ProjectAgentEntityTypeEntityBatchDeleteCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8220,13 +8202,15 @@ impl<'a, C> ProjectAgentEntityTypeEntityBatchDeleteCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8491,25 +8475,15 @@ impl<'a, C> ProjectAgentEntityTypeEntityBatchUpdateCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8517,13 +8491,15 @@ impl<'a, C> ProjectAgentEntityTypeEntityBatchUpdateCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8788,25 +8764,15 @@ impl<'a, C> ProjectAgentEntityTypeBatchDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8814,13 +8780,15 @@ impl<'a, C> ProjectAgentEntityTypeBatchDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9085,25 +9053,15 @@ impl<'a, C> ProjectAgentEntityTypeBatchUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9111,13 +9069,15 @@ impl<'a, C> ProjectAgentEntityTypeBatchUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9387,25 +9347,15 @@ impl<'a, C> ProjectAgentEntityTypeCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9413,13 +9363,15 @@ impl<'a, C> ProjectAgentEntityTypeCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9670,25 +9622,15 @@ impl<'a, C> ProjectAgentEntityTypeDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9696,13 +9638,15 @@ impl<'a, C> ProjectAgentEntityTypeDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9942,25 +9886,15 @@ impl<'a, C> ProjectAgentEntityTypeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9968,13 +9902,15 @@ impl<'a, C> ProjectAgentEntityTypeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10231,25 +10167,15 @@ impl<'a, C> ProjectAgentEntityTypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10257,13 +10183,15 @@ impl<'a, C> ProjectAgentEntityTypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10550,25 +10478,15 @@ impl<'a, C> ProjectAgentEntityTypePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10576,13 +10494,15 @@ impl<'a, C> ProjectAgentEntityTypePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10860,25 +10780,15 @@ impl<'a, C> ProjectAgentEnvironmentIntentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10886,13 +10796,15 @@ impl<'a, C> ProjectAgentEnvironmentIntentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11176,25 +11088,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionContextCreateCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11202,13 +11104,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionContextCreateCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11452,25 +11356,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionContextDeleteCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11478,13 +11372,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionContextDeleteCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11719,25 +11615,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionContextGetCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11745,13 +11631,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionContextGetCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11996,25 +11884,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionContextListCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12022,13 +11900,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionContextListCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12303,25 +12183,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionContextPatchCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12329,13 +12199,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionContextPatchCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12607,25 +12479,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionEntityTypeCreateCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12633,13 +12495,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionEntityTypeCreateCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12883,25 +12747,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionEntityTypeDeleteCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12909,13 +12763,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionEntityTypeDeleteCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13150,25 +13006,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionEntityTypeGetCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13176,13 +13022,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionEntityTypeGetCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13427,25 +13275,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionEntityTypeListCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13453,13 +13291,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionEntityTypeListCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13734,25 +13574,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionEntityTypePatchCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13760,13 +13590,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionEntityTypePatchCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14017,25 +13849,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionDeleteContextCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14043,13 +13865,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionDeleteContextCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14305,25 +14129,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionDetectIntentCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14331,13 +14145,15 @@ impl<'a, C> ProjectAgentEnvironmentUserSessionDetectIntentCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14591,25 +14407,15 @@ impl<'a, C> ProjectAgentEnvironmentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14617,13 +14423,15 @@ impl<'a, C> ProjectAgentEnvironmentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14893,25 +14701,15 @@ impl<'a, C> ProjectAgentIntentBatchDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14919,13 +14717,15 @@ impl<'a, C> ProjectAgentIntentBatchDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15190,25 +14990,15 @@ impl<'a, C> ProjectAgentIntentBatchUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15216,13 +15006,15 @@ impl<'a, C> ProjectAgentIntentBatchUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15497,25 +15289,15 @@ impl<'a, C> ProjectAgentIntentCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15523,13 +15305,15 @@ impl<'a, C> ProjectAgentIntentCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15787,25 +15571,15 @@ impl<'a, C> ProjectAgentIntentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15813,13 +15587,15 @@ impl<'a, C> ProjectAgentIntentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16064,25 +15840,15 @@ impl<'a, C> ProjectAgentIntentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16090,13 +15856,15 @@ impl<'a, C> ProjectAgentIntentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16365,25 +16133,15 @@ impl<'a, C> ProjectAgentIntentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16391,13 +16149,15 @@ impl<'a, C> ProjectAgentIntentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16696,25 +16456,15 @@ impl<'a, C> ProjectAgentIntentPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16722,13 +16472,15 @@ impl<'a, C> ProjectAgentIntentPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17019,25 +16771,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseDocumentCreateCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17045,13 +16787,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseDocumentCreateCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17302,25 +17046,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseDocumentDeleteCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17328,13 +17062,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseDocumentDeleteCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17569,25 +17305,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseDocumentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17595,13 +17321,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseDocumentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17851,25 +17579,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseDocumentListCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17877,13 +17595,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseDocumentListCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18165,25 +17885,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseDocumentPatchCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18191,13 +17901,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseDocumentPatchCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18469,25 +18181,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseDocumentReloadCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18495,13 +18197,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseDocumentReloadCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18766,25 +18470,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18792,13 +18486,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19047,25 +18743,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19073,13 +18759,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19321,25 +19009,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19347,13 +19025,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19603,25 +19283,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19629,13 +19299,15 @@ impl<'a, C> ProjectAgentKnowledgeBaseListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19917,25 +19589,15 @@ impl<'a, C> ProjectAgentKnowledgeBasePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19943,13 +19605,15 @@ impl<'a, C> ProjectAgentKnowledgeBasePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20221,25 +19885,15 @@ impl<'a, C> ProjectAgentSessionContextCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20247,13 +19901,15 @@ impl<'a, C> ProjectAgentSessionContextCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20497,25 +20153,15 @@ impl<'a, C> ProjectAgentSessionContextDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20523,13 +20169,15 @@ impl<'a, C> ProjectAgentSessionContextDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20764,25 +20412,15 @@ impl<'a, C> ProjectAgentSessionContextGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20790,13 +20428,15 @@ impl<'a, C> ProjectAgentSessionContextGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21041,25 +20681,15 @@ impl<'a, C> ProjectAgentSessionContextListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21067,13 +20697,15 @@ impl<'a, C> ProjectAgentSessionContextListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21348,25 +20980,15 @@ impl<'a, C> ProjectAgentSessionContextPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21374,13 +20996,15 @@ impl<'a, C> ProjectAgentSessionContextPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21652,25 +21276,15 @@ impl<'a, C> ProjectAgentSessionEntityTypeCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21678,13 +21292,15 @@ impl<'a, C> ProjectAgentSessionEntityTypeCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21928,25 +21544,15 @@ impl<'a, C> ProjectAgentSessionEntityTypeDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21954,13 +21560,15 @@ impl<'a, C> ProjectAgentSessionEntityTypeDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22195,25 +21803,15 @@ impl<'a, C> ProjectAgentSessionEntityTypeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22221,13 +21819,15 @@ impl<'a, C> ProjectAgentSessionEntityTypeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22472,25 +22072,15 @@ impl<'a, C> ProjectAgentSessionEntityTypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22498,13 +22088,15 @@ impl<'a, C> ProjectAgentSessionEntityTypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22779,25 +22371,15 @@ impl<'a, C> ProjectAgentSessionEntityTypePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22805,13 +22387,15 @@ impl<'a, C> ProjectAgentSessionEntityTypePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23062,25 +22646,15 @@ impl<'a, C> ProjectAgentSessionDeleteContextCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23088,13 +22662,15 @@ impl<'a, C> ProjectAgentSessionDeleteContextCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23350,25 +22926,15 @@ impl<'a, C> ProjectAgentSessionDetectIntentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23376,13 +22942,15 @@ impl<'a, C> ProjectAgentSessionDetectIntentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23647,25 +23215,15 @@ impl<'a, C> ProjectAgentExportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23673,13 +23231,15 @@ impl<'a, C> ProjectAgentExportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23923,25 +23483,15 @@ impl<'a, C> ProjectAgentGetFulfillmentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23949,13 +23499,15 @@ impl<'a, C> ProjectAgentGetFulfillmentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24195,25 +23747,15 @@ impl<'a, C> ProjectAgentGetValidationResultCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24221,13 +23763,15 @@ impl<'a, C> ProjectAgentGetValidationResultCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24490,25 +24034,15 @@ impl<'a, C> ProjectAgentImportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24516,13 +24050,15 @@ impl<'a, C> ProjectAgentImportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24787,25 +24323,15 @@ impl<'a, C> ProjectAgentRestoreCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24813,13 +24339,15 @@ impl<'a, C> ProjectAgentRestoreCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25073,25 +24601,15 @@ impl<'a, C> ProjectAgentSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25099,13 +24617,15 @@ impl<'a, C> ProjectAgentSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25375,25 +24895,15 @@ impl<'a, C> ProjectAgentTrainCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25401,13 +24911,15 @@ impl<'a, C> ProjectAgentTrainCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25677,25 +25189,15 @@ impl<'a, C> ProjectAgentUpdateFulfillmentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25703,13 +25205,15 @@ impl<'a, C> ProjectAgentUpdateFulfillmentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25960,25 +25464,15 @@ impl<'a, C> ProjectAnswerRecordGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25986,13 +25480,15 @@ impl<'a, C> ProjectAnswerRecordGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26237,25 +25733,15 @@ impl<'a, C> ProjectAnswerRecordListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26263,13 +25749,15 @@ impl<'a, C> ProjectAnswerRecordListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26544,25 +26032,15 @@ impl<'a, C> ProjectAnswerRecordPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26570,13 +26048,15 @@ impl<'a, C> ProjectAnswerRecordPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26848,25 +26328,15 @@ impl<'a, C> ProjectConversationProfileCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26874,13 +26344,15 @@ impl<'a, C> ProjectConversationProfileCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27124,25 +26596,15 @@ impl<'a, C> ProjectConversationProfileDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27150,13 +26612,15 @@ impl<'a, C> ProjectConversationProfileDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27391,25 +26855,15 @@ impl<'a, C> ProjectConversationProfileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27417,13 +26871,15 @@ impl<'a, C> ProjectConversationProfileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27668,25 +27124,15 @@ impl<'a, C> ProjectConversationProfileListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27694,13 +27140,15 @@ impl<'a, C> ProjectConversationProfileListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27975,25 +27423,15 @@ impl<'a, C> ProjectConversationProfilePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28001,13 +27439,15 @@ impl<'a, C> ProjectConversationProfilePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28279,25 +27719,15 @@ impl<'a, C> ProjectConversationMessageBatchCreateCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28305,13 +27735,15 @@ impl<'a, C> ProjectConversationMessageBatchCreateCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28570,25 +28002,15 @@ impl<'a, C> ProjectConversationMessageListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28596,13 +28018,15 @@ impl<'a, C> ProjectConversationMessageListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28879,25 +28303,15 @@ impl<'a, C> ProjectConversationParticipantSuggestionCompileCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28905,13 +28319,15 @@ impl<'a, C> ProjectConversationParticipantSuggestionCompileCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29170,25 +28586,15 @@ impl<'a, C> ProjectConversationParticipantSuggestionListCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29196,13 +28602,15 @@ impl<'a, C> ProjectConversationParticipantSuggestionListCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29479,25 +28887,15 @@ impl<'a, C> ProjectConversationParticipantSuggestionSuggestArticleCall<'a, C> wh return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29505,13 +28903,15 @@ impl<'a, C> ProjectConversationParticipantSuggestionSuggestArticleCall<'a, C> wh } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29776,25 +29176,15 @@ impl<'a, C> ProjectConversationParticipantSuggestionSuggestFaqAnswerCall<'a, C> return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29802,13 +29192,15 @@ impl<'a, C> ProjectConversationParticipantSuggestionSuggestFaqAnswerCall<'a, C> } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30073,25 +29465,15 @@ impl<'a, C> ProjectConversationParticipantSuggestionSuggestSmartReplyCall<'a, C> return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30099,13 +29481,15 @@ impl<'a, C> ProjectConversationParticipantSuggestionSuggestSmartReplyCall<'a, C> } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30370,25 +29754,15 @@ impl<'a, C> ProjectConversationParticipantAnalyzeContentCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30396,13 +29770,15 @@ impl<'a, C> ProjectConversationParticipantAnalyzeContentCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30667,25 +30043,15 @@ impl<'a, C> ProjectConversationParticipantCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30693,13 +30059,15 @@ impl<'a, C> ProjectConversationParticipantCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30943,25 +30311,15 @@ impl<'a, C> ProjectConversationParticipantGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30969,13 +30327,15 @@ impl<'a, C> ProjectConversationParticipantGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31220,25 +30580,15 @@ impl<'a, C> ProjectConversationParticipantListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31246,13 +30596,15 @@ impl<'a, C> ProjectConversationParticipantListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31527,25 +30879,15 @@ impl<'a, C> ProjectConversationParticipantPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31553,13 +30895,15 @@ impl<'a, C> ProjectConversationParticipantPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31831,25 +31175,15 @@ impl<'a, C> ProjectConversationCompleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31857,13 +31191,15 @@ impl<'a, C> ProjectConversationCompleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32133,25 +31469,15 @@ impl<'a, C> ProjectConversationCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32159,13 +31485,15 @@ impl<'a, C> ProjectConversationCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32416,25 +31744,15 @@ impl<'a, C> ProjectConversationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32442,13 +31760,15 @@ impl<'a, C> ProjectConversationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32698,25 +32018,15 @@ impl<'a, C> ProjectConversationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32724,13 +32034,15 @@ impl<'a, C> ProjectConversationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33012,25 +32324,15 @@ impl<'a, C> ProjectKnowledgeBaseDocumentCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33038,13 +32340,15 @@ impl<'a, C> ProjectKnowledgeBaseDocumentCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33295,25 +32599,15 @@ impl<'a, C> ProjectKnowledgeBaseDocumentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33321,13 +32615,15 @@ impl<'a, C> ProjectKnowledgeBaseDocumentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33562,25 +32858,15 @@ impl<'a, C> ProjectKnowledgeBaseDocumentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33588,13 +32874,15 @@ impl<'a, C> ProjectKnowledgeBaseDocumentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33850,25 +33138,15 @@ impl<'a, C> ProjectKnowledgeBaseDocumentImportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33876,13 +33154,15 @@ impl<'a, C> ProjectKnowledgeBaseDocumentImportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34141,25 +33421,15 @@ impl<'a, C> ProjectKnowledgeBaseDocumentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34167,13 +33437,15 @@ impl<'a, C> ProjectKnowledgeBaseDocumentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34455,25 +33727,15 @@ impl<'a, C> ProjectKnowledgeBaseDocumentPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34481,13 +33743,15 @@ impl<'a, C> ProjectKnowledgeBaseDocumentPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34759,25 +34023,15 @@ impl<'a, C> ProjectKnowledgeBaseDocumentReloadCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34785,13 +34039,15 @@ impl<'a, C> ProjectKnowledgeBaseDocumentReloadCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35056,25 +34312,15 @@ impl<'a, C> ProjectKnowledgeBaseCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35082,13 +34328,15 @@ impl<'a, C> ProjectKnowledgeBaseCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35337,25 +34585,15 @@ impl<'a, C> ProjectKnowledgeBaseDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35363,13 +34601,15 @@ impl<'a, C> ProjectKnowledgeBaseDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35611,25 +34851,15 @@ impl<'a, C> ProjectKnowledgeBaseGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35637,13 +34867,15 @@ impl<'a, C> ProjectKnowledgeBaseGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35893,25 +35125,15 @@ impl<'a, C> ProjectKnowledgeBaseListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35919,13 +35141,15 @@ impl<'a, C> ProjectKnowledgeBaseListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36207,25 +35431,15 @@ impl<'a, C> ProjectKnowledgeBasePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36233,13 +35447,15 @@ impl<'a, C> ProjectKnowledgeBasePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36511,25 +35727,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeEntityBatchCreateCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36537,13 +35743,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeEntityBatchCreateCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36808,25 +36016,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeEntityBatchDeleteCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36834,13 +36032,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeEntityBatchDeleteCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37105,25 +36305,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeEntityBatchUpdateCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37131,13 +36321,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeEntityBatchUpdateCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37402,25 +36594,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeBatchDeleteCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37428,13 +36610,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeBatchDeleteCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37699,25 +36883,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeBatchUpdateCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37725,13 +36899,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeBatchUpdateCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38001,25 +37177,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38027,13 +37193,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38284,25 +37452,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38310,13 +37468,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38556,25 +37716,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38582,13 +37732,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38845,25 +37997,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38871,13 +38013,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39164,25 +38308,15 @@ impl<'a, C> ProjectLocationAgentEntityTypePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39190,13 +38324,15 @@ impl<'a, C> ProjectLocationAgentEntityTypePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39475,25 +38611,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionContextCreateCall<'a, C> w return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39501,13 +38627,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionContextCreateCall<'a, C> w } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39751,25 +38879,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionContextDeleteCall<'a, C> w return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39777,13 +38895,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionContextDeleteCall<'a, C> w } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40018,25 +39138,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionContextGetCall<'a, C> wher return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40044,13 +39154,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionContextGetCall<'a, C> wher } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40295,25 +39407,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionContextListCall<'a, C> whe return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40321,13 +39423,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionContextListCall<'a, C> whe } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40602,25 +39706,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionContextPatchCall<'a, C> wh return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40628,13 +39722,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionContextPatchCall<'a, C> wh } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40906,25 +40002,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionEntityTypeCreateCall<'a, C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40932,13 +40018,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionEntityTypeCreateCall<'a, C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41182,25 +40270,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionEntityTypeDeleteCall<'a, C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41208,13 +40286,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionEntityTypeDeleteCall<'a, C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41449,25 +40529,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionEntityTypeGetCall<'a, C> w return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41475,13 +40545,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionEntityTypeGetCall<'a, C> w } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41726,25 +40798,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionEntityTypeListCall<'a, C> return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41752,13 +40814,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionEntityTypeListCall<'a, C> } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42033,25 +41097,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionEntityTypePatchCall<'a, C> return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42059,13 +41113,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionEntityTypePatchCall<'a, C> } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42316,25 +41372,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionDeleteContextCall<'a, C> w return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42342,13 +41388,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionDeleteContextCall<'a, C> w } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42604,25 +41652,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionDetectIntentCall<'a, C> wh return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42630,13 +41668,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentUserSessionDetectIntentCall<'a, C> wh } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42890,25 +41930,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42916,13 +41946,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43192,25 +42224,15 @@ impl<'a, C> ProjectLocationAgentIntentBatchDeleteCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43218,13 +42240,15 @@ impl<'a, C> ProjectLocationAgentIntentBatchDeleteCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43489,25 +42513,15 @@ impl<'a, C> ProjectLocationAgentIntentBatchUpdateCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43515,13 +42529,15 @@ impl<'a, C> ProjectLocationAgentIntentBatchUpdateCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43796,25 +42812,15 @@ impl<'a, C> ProjectLocationAgentIntentCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43822,13 +42828,15 @@ impl<'a, C> ProjectLocationAgentIntentCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44086,25 +43094,15 @@ impl<'a, C> ProjectLocationAgentIntentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44112,13 +43110,15 @@ impl<'a, C> ProjectLocationAgentIntentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44363,25 +43363,15 @@ impl<'a, C> ProjectLocationAgentIntentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44389,13 +43379,15 @@ impl<'a, C> ProjectLocationAgentIntentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44664,25 +43656,15 @@ impl<'a, C> ProjectLocationAgentIntentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44690,13 +43672,15 @@ impl<'a, C> ProjectLocationAgentIntentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44995,25 +43979,15 @@ impl<'a, C> ProjectLocationAgentIntentPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45021,13 +43995,15 @@ impl<'a, C> ProjectLocationAgentIntentPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45313,25 +44289,15 @@ impl<'a, C> ProjectLocationAgentSessionContextCreateCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45339,13 +44305,15 @@ impl<'a, C> ProjectLocationAgentSessionContextCreateCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45589,25 +44557,15 @@ impl<'a, C> ProjectLocationAgentSessionContextDeleteCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45615,13 +44573,15 @@ impl<'a, C> ProjectLocationAgentSessionContextDeleteCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45856,25 +44816,15 @@ impl<'a, C> ProjectLocationAgentSessionContextGetCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45882,13 +44832,15 @@ impl<'a, C> ProjectLocationAgentSessionContextGetCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46133,25 +45085,15 @@ impl<'a, C> ProjectLocationAgentSessionContextListCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46159,13 +45101,15 @@ impl<'a, C> ProjectLocationAgentSessionContextListCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46440,25 +45384,15 @@ impl<'a, C> ProjectLocationAgentSessionContextPatchCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46466,13 +45400,15 @@ impl<'a, C> ProjectLocationAgentSessionContextPatchCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46744,25 +45680,15 @@ impl<'a, C> ProjectLocationAgentSessionEntityTypeCreateCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46770,13 +45696,15 @@ impl<'a, C> ProjectLocationAgentSessionEntityTypeCreateCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47020,25 +45948,15 @@ impl<'a, C> ProjectLocationAgentSessionEntityTypeDeleteCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47046,13 +45964,15 @@ impl<'a, C> ProjectLocationAgentSessionEntityTypeDeleteCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47287,25 +46207,15 @@ impl<'a, C> ProjectLocationAgentSessionEntityTypeGetCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47313,13 +46223,15 @@ impl<'a, C> ProjectLocationAgentSessionEntityTypeGetCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47564,25 +46476,15 @@ impl<'a, C> ProjectLocationAgentSessionEntityTypeListCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47590,13 +46492,15 @@ impl<'a, C> ProjectLocationAgentSessionEntityTypeListCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47871,25 +46775,15 @@ impl<'a, C> ProjectLocationAgentSessionEntityTypePatchCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47897,13 +46791,15 @@ impl<'a, C> ProjectLocationAgentSessionEntityTypePatchCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -48154,25 +47050,15 @@ impl<'a, C> ProjectLocationAgentSessionDeleteContextCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -48180,13 +47066,15 @@ impl<'a, C> ProjectLocationAgentSessionDeleteContextCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -48442,25 +47330,15 @@ impl<'a, C> ProjectLocationAgentSessionDetectIntentCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -48468,13 +47346,15 @@ impl<'a, C> ProjectLocationAgentSessionDetectIntentCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -48739,25 +47619,15 @@ impl<'a, C> ProjectLocationAgentExportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -48765,13 +47635,15 @@ impl<'a, C> ProjectLocationAgentExportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49015,25 +47887,15 @@ impl<'a, C> ProjectLocationAgentGetFulfillmentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -49041,13 +47903,15 @@ impl<'a, C> ProjectLocationAgentGetFulfillmentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49287,25 +48151,15 @@ impl<'a, C> ProjectLocationAgentGetValidationResultCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -49313,13 +48167,15 @@ impl<'a, C> ProjectLocationAgentGetValidationResultCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49582,25 +48438,15 @@ impl<'a, C> ProjectLocationAgentImportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -49608,13 +48454,15 @@ impl<'a, C> ProjectLocationAgentImportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -49879,25 +48727,15 @@ impl<'a, C> ProjectLocationAgentRestoreCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -49905,13 +48743,15 @@ impl<'a, C> ProjectLocationAgentRestoreCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -50165,25 +49005,15 @@ impl<'a, C> ProjectLocationAgentSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -50191,13 +49021,15 @@ impl<'a, C> ProjectLocationAgentSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -50467,25 +49299,15 @@ impl<'a, C> ProjectLocationAgentTrainCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -50493,13 +49315,15 @@ impl<'a, C> ProjectLocationAgentTrainCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -50769,25 +49593,15 @@ impl<'a, C> ProjectLocationAgentUpdateFulfillmentCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -50795,13 +49609,15 @@ impl<'a, C> ProjectLocationAgentUpdateFulfillmentCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51052,25 +49868,15 @@ impl<'a, C> ProjectLocationAnswerRecordGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51078,13 +49884,15 @@ impl<'a, C> ProjectLocationAnswerRecordGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51329,25 +50137,15 @@ impl<'a, C> ProjectLocationAnswerRecordListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51355,13 +50153,15 @@ impl<'a, C> ProjectLocationAnswerRecordListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51636,25 +50436,15 @@ impl<'a, C> ProjectLocationAnswerRecordPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51662,13 +50452,15 @@ impl<'a, C> ProjectLocationAnswerRecordPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -51940,25 +50732,15 @@ impl<'a, C> ProjectLocationConversationProfileCreateCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -51966,13 +50748,15 @@ impl<'a, C> ProjectLocationConversationProfileCreateCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -52216,25 +51000,15 @@ impl<'a, C> ProjectLocationConversationProfileDeleteCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -52242,13 +51016,15 @@ impl<'a, C> ProjectLocationConversationProfileDeleteCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -52483,25 +51259,15 @@ impl<'a, C> ProjectLocationConversationProfileGetCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -52509,13 +51275,15 @@ impl<'a, C> ProjectLocationConversationProfileGetCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -52760,25 +51528,15 @@ impl<'a, C> ProjectLocationConversationProfileListCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -52786,13 +51544,15 @@ impl<'a, C> ProjectLocationConversationProfileListCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -53067,25 +51827,15 @@ impl<'a, C> ProjectLocationConversationProfilePatchCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -53093,13 +51843,15 @@ impl<'a, C> ProjectLocationConversationProfilePatchCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -53371,25 +52123,15 @@ impl<'a, C> ProjectLocationConversationMessageBatchCreateCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -53397,13 +52139,15 @@ impl<'a, C> ProjectLocationConversationMessageBatchCreateCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -53662,25 +52406,15 @@ impl<'a, C> ProjectLocationConversationMessageListCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -53688,13 +52422,15 @@ impl<'a, C> ProjectLocationConversationMessageListCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -53971,25 +52707,15 @@ impl<'a, C> ProjectLocationConversationParticipantSuggestionSuggestArticleCall<' return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -53997,13 +52723,15 @@ impl<'a, C> ProjectLocationConversationParticipantSuggestionSuggestArticleCall<' } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -54268,25 +52996,15 @@ impl<'a, C> ProjectLocationConversationParticipantSuggestionSuggestFaqAnswerCall return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -54294,13 +53012,15 @@ impl<'a, C> ProjectLocationConversationParticipantSuggestionSuggestFaqAnswerCall } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -54565,25 +53285,15 @@ impl<'a, C> ProjectLocationConversationParticipantSuggestionSuggestSmartReplyCal return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -54591,13 +53301,15 @@ impl<'a, C> ProjectLocationConversationParticipantSuggestionSuggestSmartReplyCal } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -54862,25 +53574,15 @@ impl<'a, C> ProjectLocationConversationParticipantAnalyzeContentCall<'a, C> wher return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -54888,13 +53590,15 @@ impl<'a, C> ProjectLocationConversationParticipantAnalyzeContentCall<'a, C> wher } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -55159,25 +53863,15 @@ impl<'a, C> ProjectLocationConversationParticipantCreateCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -55185,13 +53879,15 @@ impl<'a, C> ProjectLocationConversationParticipantCreateCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -55435,25 +54131,15 @@ impl<'a, C> ProjectLocationConversationParticipantGetCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -55461,13 +54147,15 @@ impl<'a, C> ProjectLocationConversationParticipantGetCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -55712,25 +54400,15 @@ impl<'a, C> ProjectLocationConversationParticipantListCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -55738,13 +54416,15 @@ impl<'a, C> ProjectLocationConversationParticipantListCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -56019,25 +54699,15 @@ impl<'a, C> ProjectLocationConversationParticipantPatchCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -56045,13 +54715,15 @@ impl<'a, C> ProjectLocationConversationParticipantPatchCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -56323,25 +54995,15 @@ impl<'a, C> ProjectLocationConversationCompleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -56349,13 +55011,15 @@ impl<'a, C> ProjectLocationConversationCompleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -56625,25 +55289,15 @@ impl<'a, C> ProjectLocationConversationCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -56651,13 +55305,15 @@ impl<'a, C> ProjectLocationConversationCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -56908,25 +55564,15 @@ impl<'a, C> ProjectLocationConversationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -56934,13 +55580,15 @@ impl<'a, C> ProjectLocationConversationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -57190,25 +55838,15 @@ impl<'a, C> ProjectLocationConversationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -57216,13 +55854,15 @@ impl<'a, C> ProjectLocationConversationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -57504,25 +56144,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseDocumentCreateCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -57530,13 +56160,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseDocumentCreateCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -57787,25 +56419,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseDocumentDeleteCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -57813,13 +56435,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseDocumentDeleteCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -58054,25 +56678,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseDocumentGetCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -58080,13 +56694,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseDocumentGetCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -58342,25 +56958,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseDocumentImportCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -58368,13 +56974,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseDocumentImportCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -58633,25 +57241,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseDocumentListCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -58659,13 +57257,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseDocumentListCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -58947,25 +57547,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseDocumentPatchCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -58973,13 +57563,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseDocumentPatchCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -59251,25 +57843,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseDocumentReloadCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -59277,13 +57859,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseDocumentReloadCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -59548,25 +58132,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -59574,13 +58148,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -59829,25 +58405,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -59855,13 +58421,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -60103,25 +58671,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -60129,13 +58687,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -60385,25 +58945,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -60411,13 +58961,15 @@ impl<'a, C> ProjectLocationKnowledgeBaseListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -60699,25 +59251,15 @@ impl<'a, C> ProjectLocationKnowledgeBasePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -60725,13 +59267,15 @@ impl<'a, C> ProjectLocationKnowledgeBasePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -60982,25 +59526,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -61008,13 +59542,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -61249,25 +59785,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -61275,13 +59801,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -61531,25 +60059,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -61557,13 +60075,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -61819,25 +60339,15 @@ impl<'a, C> ProjectLocationDeleteAgentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -61845,13 +60355,15 @@ impl<'a, C> ProjectLocationDeleteAgentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -62086,25 +60598,15 @@ impl<'a, C> ProjectLocationGetAgentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -62112,13 +60614,15 @@ impl<'a, C> ProjectLocationGetAgentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -62379,25 +60883,15 @@ impl<'a, C> ProjectLocationSetAgentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -62405,13 +60899,15 @@ impl<'a, C> ProjectLocationSetAgentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -62662,25 +61158,15 @@ impl<'a, C> ProjectOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -62688,13 +61174,15 @@ impl<'a, C> ProjectOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -62929,25 +61417,15 @@ impl<'a, C> ProjectOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -62955,13 +61433,15 @@ impl<'a, C> ProjectOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -63211,25 +61691,15 @@ impl<'a, C> ProjectOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -63237,13 +61707,15 @@ impl<'a, C> ProjectOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -63499,25 +61971,15 @@ impl<'a, C> ProjectDeleteAgentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -63525,13 +61987,15 @@ impl<'a, C> ProjectDeleteAgentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -63766,25 +62230,15 @@ impl<'a, C> ProjectGetAgentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -63792,13 +62246,15 @@ impl<'a, C> ProjectGetAgentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -64059,25 +62515,15 @@ impl<'a, C> ProjectSetAgentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -64085,13 +62531,15 @@ impl<'a, C> ProjectSetAgentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/dialogflow2_beta1/src/client.rs b/gen/dialogflow2_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/dialogflow2_beta1/src/client.rs +++ b/gen/dialogflow2_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/dialogflow3-cli/src/main.rs b/gen/dialogflow3-cli/src/main.rs index df57117faa..44225dbd31 100644 --- a/gen/dialogflow3-cli/src/main.rs +++ b/gen/dialogflow3-cli/src/main.rs @@ -423,7 +423,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "language-code"].iter().map(|v|*v)); + v.extend(["language-code", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -520,7 +520,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["update-mask", "language-code"].iter().map(|v|*v)); + v.extend(["language-code", "update-mask"].iter().map(|v|*v)); v } )); } } @@ -918,7 +918,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1296,7 +1296,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1355,7 +1355,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1809,7 +1809,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2537,7 +2537,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "language-code"].iter().map(|v|*v)); + v.extend(["language-code", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2804,7 +2804,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "language-code"].iter().map(|v|*v)); + v.extend(["language-code", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2900,7 +2900,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["update-mask", "language-code"].iter().map(|v|*v)); + v.extend(["language-code", "update-mask"].iter().map(|v|*v)); v } )); } } @@ -2998,7 +2998,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["update-mask", "language-code"].iter().map(|v|*v)); + v.extend(["language-code", "update-mask"].iter().map(|v|*v)); v } )); } } @@ -3346,7 +3346,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "language-code"].iter().map(|v|*v)); + v.extend(["language-code", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3439,7 +3439,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["update-mask", "language-code"].iter().map(|v|*v)); + v.extend(["language-code", "update-mask"].iter().map(|v|*v)); v } )); } } @@ -3779,7 +3779,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -4335,7 +4335,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "intent-view", "page-size", "language-code"].iter().map(|v|*v)); + v.extend(["intent-view", "language-code", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -4432,7 +4432,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["update-mask", "language-code"].iter().map(|v|*v)); + v.extend(["language-code", "update-mask"].iter().map(|v|*v)); v } )); } } @@ -4491,7 +4491,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -5039,7 +5039,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -5966,7 +5966,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "view"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "view"].iter().map(|v|*v)); v } )); } } @@ -6179,7 +6179,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -6608,7 +6608,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -6870,7 +6870,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -7124,7 +7124,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -7385,7 +7385,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/dialogflow3/src/api.rs b/gen/dialogflow3/src/api.rs index 90dcecabe8..99f9b0aa50 100644 --- a/gen/dialogflow3/src/api.rs +++ b/gen/dialogflow3/src/api.rs @@ -4938,25 +4938,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4964,13 +4954,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5226,25 +5218,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5252,13 +5234,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5505,25 +5489,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5531,13 +5505,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5794,25 +5770,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5820,13 +5786,15 @@ impl<'a, C> ProjectLocationAgentEntityTypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6113,25 +6081,15 @@ impl<'a, C> ProjectLocationAgentEntityTypePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6139,13 +6097,15 @@ impl<'a, C> ProjectLocationAgentEntityTypePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6424,25 +6384,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentExperimentCreateCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6450,13 +6400,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentExperimentCreateCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6700,25 +6652,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentExperimentDeleteCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6726,13 +6668,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentExperimentDeleteCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6967,25 +6911,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentExperimentGetCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6993,13 +6927,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentExperimentGetCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7244,25 +7180,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentExperimentListCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7270,13 +7196,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentExperimentListCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7551,25 +7479,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentExperimentPatchCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7577,13 +7495,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentExperimentPatchCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7855,25 +7775,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentExperimentStartCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7881,13 +7791,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentExperimentStartCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8152,25 +8064,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentExperimentStopCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8178,13 +8080,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentExperimentStopCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8449,25 +8353,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentSessionEntityTypeCreateCall<'a, C> wh return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8475,13 +8369,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentSessionEntityTypeCreateCall<'a, C> wh } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8725,25 +8621,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentSessionEntityTypeDeleteCall<'a, C> wh return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8751,13 +8637,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentSessionEntityTypeDeleteCall<'a, C> wh } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8992,25 +8880,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentSessionEntityTypeGetCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9018,13 +8896,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentSessionEntityTypeGetCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9269,25 +9149,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentSessionEntityTypeListCall<'a, C> wher return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9295,13 +9165,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentSessionEntityTypeListCall<'a, C> wher } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9576,25 +9448,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentSessionEntityTypePatchCall<'a, C> whe return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9602,13 +9464,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentSessionEntityTypePatchCall<'a, C> whe } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9880,25 +9744,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentSessionDetectIntentCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9906,13 +9760,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentSessionDetectIntentCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10177,25 +10033,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentSessionFulfillIntentCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10203,13 +10049,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentSessionFulfillIntentCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10474,25 +10322,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentSessionMatchIntentCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10500,13 +10338,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentSessionMatchIntentCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10771,25 +10611,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentCreateCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10797,13 +10627,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentCreateCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11047,25 +10879,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentDeleteCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11073,13 +10895,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentDeleteCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11314,25 +11138,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11340,13 +11154,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11591,25 +11407,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11617,13 +11423,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11882,25 +11690,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentLookupEnvironmentHistoryCall<'a, C> w return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11908,13 +11706,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentLookupEnvironmentHistoryCall<'a, C> w } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12189,25 +11989,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12215,13 +12005,15 @@ impl<'a, C> ProjectLocationAgentEnvironmentPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12498,25 +12290,15 @@ impl<'a, C> ProjectLocationAgentFlowPageCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12524,13 +12306,15 @@ impl<'a, C> ProjectLocationAgentFlowPageCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12786,25 +12570,15 @@ impl<'a, C> ProjectLocationAgentFlowPageDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12812,13 +12586,15 @@ impl<'a, C> ProjectLocationAgentFlowPageDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13065,25 +12841,15 @@ impl<'a, C> ProjectLocationAgentFlowPageGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13091,13 +12857,15 @@ impl<'a, C> ProjectLocationAgentFlowPageGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13354,25 +13122,15 @@ impl<'a, C> ProjectLocationAgentFlowPageListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13380,13 +13138,15 @@ impl<'a, C> ProjectLocationAgentFlowPageListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13673,25 +13433,15 @@ impl<'a, C> ProjectLocationAgentFlowPagePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13699,13 +13449,15 @@ impl<'a, C> ProjectLocationAgentFlowPagePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13989,25 +13741,15 @@ impl<'a, C> ProjectLocationAgentFlowTransitionRouteGroupCreateCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14015,13 +13757,15 @@ impl<'a, C> ProjectLocationAgentFlowTransitionRouteGroupCreateCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14277,25 +14021,15 @@ impl<'a, C> ProjectLocationAgentFlowTransitionRouteGroupDeleteCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14303,13 +14037,15 @@ impl<'a, C> ProjectLocationAgentFlowTransitionRouteGroupDeleteCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14556,25 +14292,15 @@ impl<'a, C> ProjectLocationAgentFlowTransitionRouteGroupGetCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14582,13 +14308,15 @@ impl<'a, C> ProjectLocationAgentFlowTransitionRouteGroupGetCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14845,25 +14573,15 @@ impl<'a, C> ProjectLocationAgentFlowTransitionRouteGroupListCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14871,13 +14589,15 @@ impl<'a, C> ProjectLocationAgentFlowTransitionRouteGroupListCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15164,25 +14884,15 @@ impl<'a, C> ProjectLocationAgentFlowTransitionRouteGroupPatchCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15190,13 +14900,15 @@ impl<'a, C> ProjectLocationAgentFlowTransitionRouteGroupPatchCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15475,25 +15187,15 @@ impl<'a, C> ProjectLocationAgentFlowVersionCreateCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15501,13 +15203,15 @@ impl<'a, C> ProjectLocationAgentFlowVersionCreateCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15751,25 +15455,15 @@ impl<'a, C> ProjectLocationAgentFlowVersionDeleteCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15777,13 +15471,15 @@ impl<'a, C> ProjectLocationAgentFlowVersionDeleteCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16018,25 +15714,15 @@ impl<'a, C> ProjectLocationAgentFlowVersionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16044,13 +15730,15 @@ impl<'a, C> ProjectLocationAgentFlowVersionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16295,25 +15983,15 @@ impl<'a, C> ProjectLocationAgentFlowVersionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16321,13 +15999,15 @@ impl<'a, C> ProjectLocationAgentFlowVersionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16597,25 +16277,15 @@ impl<'a, C> ProjectLocationAgentFlowVersionLoadCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16623,13 +16293,15 @@ impl<'a, C> ProjectLocationAgentFlowVersionLoadCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16899,25 +16571,15 @@ impl<'a, C> ProjectLocationAgentFlowVersionPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16925,13 +16587,15 @@ impl<'a, C> ProjectLocationAgentFlowVersionPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17208,25 +16872,15 @@ impl<'a, C> ProjectLocationAgentFlowCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17234,13 +16888,15 @@ impl<'a, C> ProjectLocationAgentFlowCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17496,25 +17152,15 @@ impl<'a, C> ProjectLocationAgentFlowDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17522,13 +17168,15 @@ impl<'a, C> ProjectLocationAgentFlowDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17775,25 +17423,15 @@ impl<'a, C> ProjectLocationAgentFlowGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17801,13 +17439,15 @@ impl<'a, C> ProjectLocationAgentFlowGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18054,25 +17694,15 @@ impl<'a, C> ProjectLocationAgentFlowGetValidationResultCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18080,13 +17710,15 @@ impl<'a, C> ProjectLocationAgentFlowGetValidationResultCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18343,25 +17975,15 @@ impl<'a, C> ProjectLocationAgentFlowListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18369,13 +17991,15 @@ impl<'a, C> ProjectLocationAgentFlowListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18662,25 +18286,15 @@ impl<'a, C> ProjectLocationAgentFlowPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18688,13 +18302,15 @@ impl<'a, C> ProjectLocationAgentFlowPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18973,25 +18589,15 @@ impl<'a, C> ProjectLocationAgentFlowTrainCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18999,13 +18605,15 @@ impl<'a, C> ProjectLocationAgentFlowTrainCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19270,25 +18878,15 @@ impl<'a, C> ProjectLocationAgentFlowValidateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19296,13 +18894,15 @@ impl<'a, C> ProjectLocationAgentFlowValidateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19572,25 +19172,15 @@ impl<'a, C> ProjectLocationAgentIntentCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19598,13 +19188,15 @@ impl<'a, C> ProjectLocationAgentIntentCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19855,25 +19447,15 @@ impl<'a, C> ProjectLocationAgentIntentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19881,13 +19463,15 @@ impl<'a, C> ProjectLocationAgentIntentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20127,25 +19711,15 @@ impl<'a, C> ProjectLocationAgentIntentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20153,13 +19727,15 @@ impl<'a, C> ProjectLocationAgentIntentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20421,25 +19997,15 @@ impl<'a, C> ProjectLocationAgentIntentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20447,13 +20013,15 @@ impl<'a, C> ProjectLocationAgentIntentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20747,25 +20315,15 @@ impl<'a, C> ProjectLocationAgentIntentPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20773,13 +20331,15 @@ impl<'a, C> ProjectLocationAgentIntentPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21058,25 +20618,15 @@ impl<'a, C> ProjectLocationAgentSessionEntityTypeCreateCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21084,13 +20634,15 @@ impl<'a, C> ProjectLocationAgentSessionEntityTypeCreateCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21334,25 +20886,15 @@ impl<'a, C> ProjectLocationAgentSessionEntityTypeDeleteCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21360,13 +20902,15 @@ impl<'a, C> ProjectLocationAgentSessionEntityTypeDeleteCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21601,25 +21145,15 @@ impl<'a, C> ProjectLocationAgentSessionEntityTypeGetCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21627,13 +21161,15 @@ impl<'a, C> ProjectLocationAgentSessionEntityTypeGetCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21878,25 +21414,15 @@ impl<'a, C> ProjectLocationAgentSessionEntityTypeListCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21904,13 +21430,15 @@ impl<'a, C> ProjectLocationAgentSessionEntityTypeListCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22185,25 +21713,15 @@ impl<'a, C> ProjectLocationAgentSessionEntityTypePatchCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22211,13 +21729,15 @@ impl<'a, C> ProjectLocationAgentSessionEntityTypePatchCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22489,25 +22009,15 @@ impl<'a, C> ProjectLocationAgentSessionDetectIntentCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22515,13 +22025,15 @@ impl<'a, C> ProjectLocationAgentSessionDetectIntentCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22786,25 +22298,15 @@ impl<'a, C> ProjectLocationAgentSessionFulfillIntentCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22812,13 +22314,15 @@ impl<'a, C> ProjectLocationAgentSessionFulfillIntentCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23083,25 +22587,15 @@ impl<'a, C> ProjectLocationAgentSessionMatchIntentCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23109,13 +22603,15 @@ impl<'a, C> ProjectLocationAgentSessionMatchIntentCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23359,25 +22855,15 @@ impl<'a, C> ProjectLocationAgentTestCaseResultGetCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23385,13 +22871,15 @@ impl<'a, C> ProjectLocationAgentTestCaseResultGetCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23641,25 +23129,15 @@ impl<'a, C> ProjectLocationAgentTestCaseResultListCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23667,13 +23145,15 @@ impl<'a, C> ProjectLocationAgentTestCaseResultListCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23950,25 +23430,15 @@ impl<'a, C> ProjectLocationAgentTestCaseBatchDeleteCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23976,13 +23446,15 @@ impl<'a, C> ProjectLocationAgentTestCaseBatchDeleteCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24247,25 +23719,15 @@ impl<'a, C> ProjectLocationAgentTestCaseBatchRunCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24273,13 +23735,15 @@ impl<'a, C> ProjectLocationAgentTestCaseBatchRunCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24528,25 +23992,15 @@ impl<'a, C> ProjectLocationAgentTestCaseCalculateCoverageCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24554,13 +24008,15 @@ impl<'a, C> ProjectLocationAgentTestCaseCalculateCoverageCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24823,25 +24279,15 @@ impl<'a, C> ProjectLocationAgentTestCaseCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24849,13 +24295,15 @@ impl<'a, C> ProjectLocationAgentTestCaseCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25120,25 +24568,15 @@ impl<'a, C> ProjectLocationAgentTestCaseExportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25146,13 +24584,15 @@ impl<'a, C> ProjectLocationAgentTestCaseExportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25396,25 +24836,15 @@ impl<'a, C> ProjectLocationAgentTestCaseGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25422,13 +24852,15 @@ impl<'a, C> ProjectLocationAgentTestCaseGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25684,25 +25116,15 @@ impl<'a, C> ProjectLocationAgentTestCaseImportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25710,13 +25132,15 @@ impl<'a, C> ProjectLocationAgentTestCaseImportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25975,25 +25399,15 @@ impl<'a, C> ProjectLocationAgentTestCaseListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26001,13 +25415,15 @@ impl<'a, C> ProjectLocationAgentTestCaseListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26289,25 +25705,15 @@ impl<'a, C> ProjectLocationAgentTestCasePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26315,13 +25721,15 @@ impl<'a, C> ProjectLocationAgentTestCasePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26593,25 +26001,15 @@ impl<'a, C> ProjectLocationAgentTestCaseRunCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26619,13 +26017,15 @@ impl<'a, C> ProjectLocationAgentTestCaseRunCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26890,25 +26290,15 @@ impl<'a, C> ProjectLocationAgentWebhookCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26916,13 +26306,15 @@ impl<'a, C> ProjectLocationAgentWebhookCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27171,25 +26563,15 @@ impl<'a, C> ProjectLocationAgentWebhookDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27197,13 +26579,15 @@ impl<'a, C> ProjectLocationAgentWebhookDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27445,25 +26829,15 @@ impl<'a, C> ProjectLocationAgentWebhookGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27471,13 +26845,15 @@ impl<'a, C> ProjectLocationAgentWebhookGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27722,25 +27098,15 @@ impl<'a, C> ProjectLocationAgentWebhookListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27748,13 +27114,15 @@ impl<'a, C> ProjectLocationAgentWebhookListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28029,25 +27397,15 @@ impl<'a, C> ProjectLocationAgentWebhookPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28055,13 +27413,15 @@ impl<'a, C> ProjectLocationAgentWebhookPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28333,25 +27693,15 @@ impl<'a, C> ProjectLocationAgentCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28359,13 +27709,15 @@ impl<'a, C> ProjectLocationAgentCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28609,25 +27961,15 @@ impl<'a, C> ProjectLocationAgentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28635,13 +27977,15 @@ impl<'a, C> ProjectLocationAgentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28897,25 +28241,15 @@ impl<'a, C> ProjectLocationAgentExportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28923,13 +28257,15 @@ impl<'a, C> ProjectLocationAgentExportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29173,25 +28509,15 @@ impl<'a, C> ProjectLocationAgentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29199,13 +28525,15 @@ impl<'a, C> ProjectLocationAgentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29445,25 +28773,15 @@ impl<'a, C> ProjectLocationAgentGetValidationResultCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29471,13 +28789,15 @@ impl<'a, C> ProjectLocationAgentGetValidationResultCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29729,25 +29049,15 @@ impl<'a, C> ProjectLocationAgentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29755,13 +29065,15 @@ impl<'a, C> ProjectLocationAgentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30036,25 +29348,15 @@ impl<'a, C> ProjectLocationAgentPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30062,13 +29364,15 @@ impl<'a, C> ProjectLocationAgentPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30340,25 +29644,15 @@ impl<'a, C> ProjectLocationAgentRestoreCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30366,13 +29660,15 @@ impl<'a, C> ProjectLocationAgentRestoreCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30637,25 +29933,15 @@ impl<'a, C> ProjectLocationAgentValidateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30663,13 +29949,15 @@ impl<'a, C> ProjectLocationAgentValidateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30913,25 +30201,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30939,13 +30217,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31180,25 +30460,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31206,13 +30476,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31462,25 +30734,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31488,13 +30750,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31771,25 +31035,15 @@ impl<'a, C> ProjectLocationSecuritySettingCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31797,13 +31051,15 @@ impl<'a, C> ProjectLocationSecuritySettingCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32047,25 +31303,15 @@ impl<'a, C> ProjectLocationSecuritySettingDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32073,13 +31319,15 @@ impl<'a, C> ProjectLocationSecuritySettingDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32314,25 +31562,15 @@ impl<'a, C> ProjectLocationSecuritySettingGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32340,13 +31578,15 @@ impl<'a, C> ProjectLocationSecuritySettingGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32591,25 +31831,15 @@ impl<'a, C> ProjectLocationSecuritySettingListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32617,13 +31847,15 @@ impl<'a, C> ProjectLocationSecuritySettingListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32898,25 +32130,15 @@ impl<'a, C> ProjectLocationSecuritySettingPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32924,13 +32146,15 @@ impl<'a, C> ProjectLocationSecuritySettingPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33181,25 +32405,15 @@ impl<'a, C> ProjectOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33207,13 +32421,15 @@ impl<'a, C> ProjectOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33448,25 +32664,15 @@ impl<'a, C> ProjectOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33474,13 +32680,15 @@ impl<'a, C> ProjectOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33730,25 +32938,15 @@ impl<'a, C> ProjectOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33756,13 +32954,15 @@ impl<'a, C> ProjectOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/dialogflow3/src/client.rs b/gen/dialogflow3/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/dialogflow3/src/client.rs +++ b/gen/dialogflow3/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/digitalassetlinks1-cli/src/main.rs b/gen/digitalassetlinks1-cli/src/main.rs index e3d56b1bb5..45779dd947 100644 --- a/gen/digitalassetlinks1-cli/src/main.rs +++ b/gen/digitalassetlinks1-cli/src/main.rs @@ -82,7 +82,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["source-android-app-certificate-sha256-fingerprint", "target-android-app-package-name", "source-android-app-package-name", "target-web-site", "source-web-site", "relation", "target-android-app-certificate-sha256-fingerprint"].iter().map(|v|*v)); + v.extend(["relation", "source-android-app-certificate-sha256-fingerprint", "source-android-app-package-name", "source-web-site", "target-android-app-certificate-sha256-fingerprint", "target-android-app-package-name", "target-web-site"].iter().map(|v|*v)); v } )); } } @@ -144,7 +144,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["source-android-app-package-name", "source-android-app-certificate-sha256-fingerprint", "relation", "source-web-site"].iter().map(|v|*v)); + v.extend(["relation", "source-android-app-certificate-sha256-fingerprint", "source-android-app-package-name", "source-web-site"].iter().map(|v|*v)); v } )); } } diff --git a/gen/digitalassetlinks1/src/api.rs b/gen/digitalassetlinks1/src/api.rs index 50a7c7e1b7..0b373e3170 100644 --- a/gen/digitalassetlinks1/src/api.rs +++ b/gen/digitalassetlinks1/src/api.rs @@ -554,25 +554,15 @@ impl<'a, C> AssetlinkCheckCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -580,13 +570,15 @@ impl<'a, C> AssetlinkCheckCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -822,25 +814,15 @@ impl<'a, C> StatementListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -848,13 +830,15 @@ impl<'a, C> StatementListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/digitalassetlinks1/src/client.rs b/gen/digitalassetlinks1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/digitalassetlinks1/src/client.rs +++ b/gen/digitalassetlinks1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/discovery1-cli/src/main.rs b/gen/discovery1-cli/src/main.rs index 191c13096c..7c376bf65d 100644 --- a/gen/discovery1-cli/src/main.rs +++ b/gen/discovery1-cli/src/main.rs @@ -116,7 +116,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["preferred", "name"].iter().map(|v|*v)); + v.extend(["name", "preferred"].iter().map(|v|*v)); v } )); } } diff --git a/gen/discovery1/src/api.rs b/gen/discovery1/src/api.rs index ddefad8136..db1ac39e3e 100644 --- a/gen/discovery1/src/api.rs +++ b/gen/discovery1/src/api.rs @@ -837,25 +837,15 @@ impl<'a, C> ApiGetRestCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -863,13 +853,15 @@ impl<'a, C> ApiGetRestCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1053,25 +1045,15 @@ impl<'a, C> ApiListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1079,13 +1061,15 @@ impl<'a, C> ApiListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/discovery1/src/client.rs b/gen/discovery1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/discovery1/src/client.rs +++ b/gen/discovery1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/displayvideo1-cli/src/main.rs b/gen/displayvideo1-cli/src/main.rs index a6371cc1de..cffe7744d5 100644 --- a/gen/displayvideo1-cli/src/main.rs +++ b/gen/displayvideo1-cli/src/main.rs @@ -301,7 +301,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -366,7 +366,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -641,7 +641,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -868,7 +868,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1085,7 +1085,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["partner-id", "page-token", "filter", "page-size", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token", "partner-id"].iter().map(|v|*v)); v } )); } } @@ -1181,7 +1181,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["update-mask", "partner-id"].iter().map(|v|*v)); + v.extend(["partner-id", "update-mask"].iter().map(|v|*v)); v } )); } } @@ -1482,7 +1482,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["partner-id", "page-token", "filter", "page-size", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token", "partner-id"].iter().map(|v|*v)); v } )); } } @@ -1987,7 +1987,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2300,7 +2300,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2585,7 +2585,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2822,7 +2822,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2971,7 +2971,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3365,7 +3365,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3870,7 +3870,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3938,7 +3938,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["partner-id", "page-token", "filter", "page-size", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token", "partner-id"].iter().map(|v|*v)); v } )); } } @@ -4227,7 +4227,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -4433,7 +4433,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -4902,7 +4902,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -5536,7 +5536,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -6193,7 +6193,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -6252,7 +6252,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["partner-id", "advertiser-id"].iter().map(|v|*v)); + v.extend(["advertiser-id", "partner-id"].iter().map(|v|*v)); v } )); } } @@ -6323,7 +6323,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["partner-id", "advertiser-id", "page-token", "filter", "page-size", "order-by"].iter().map(|v|*v)); + v.extend(["advertiser-id", "filter", "order-by", "page-size", "page-token", "partner-id"].iter().map(|v|*v)); v } )); } } @@ -6382,7 +6382,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["partner-id", "advertiser-id"].iter().map(|v|*v)); + v.extend(["advertiser-id", "partner-id"].iter().map(|v|*v)); v } )); } } @@ -6453,7 +6453,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["partner-id", "advertiser-id", "page-token", "filter", "page-size", "order-by"].iter().map(|v|*v)); + v.extend(["advertiser-id", "filter", "order-by", "page-size", "page-token", "partner-id"].iter().map(|v|*v)); v } )); } } @@ -6577,7 +6577,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["advertiser-id", "page-token", "filter", "page-size", "order-by"].iter().map(|v|*v)); + v.extend(["advertiser-id", "filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -6636,7 +6636,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["partner-id", "advertiser-id"].iter().map(|v|*v)); + v.extend(["advertiser-id", "partner-id"].iter().map(|v|*v)); v } )); } } @@ -6707,7 +6707,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["partner-id", "advertiser-id", "page-token", "filter", "page-size", "order-by"].iter().map(|v|*v)); + v.extend(["advertiser-id", "filter", "order-by", "page-size", "page-token", "partner-id"].iter().map(|v|*v)); v } )); } } @@ -6865,7 +6865,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["update-mask", "partner-id"].iter().map(|v|*v)); + v.extend(["partner-id", "update-mask"].iter().map(|v|*v)); v } )); } } @@ -6924,7 +6924,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["partner-id", "advertiser-id"].iter().map(|v|*v)); + v.extend(["advertiser-id", "partner-id"].iter().map(|v|*v)); v } )); } } @@ -6995,7 +6995,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["partner-id", "advertiser-id", "page-token", "filter", "page-size", "order-by"].iter().map(|v|*v)); + v.extend(["advertiser-id", "filter", "order-by", "page-size", "page-token", "partner-id"].iter().map(|v|*v)); v } )); } } @@ -7176,7 +7176,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["partner-id", "advertiser-id"].iter().map(|v|*v)); + v.extend(["advertiser-id", "partner-id"].iter().map(|v|*v)); v } )); } } @@ -7235,7 +7235,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["partner-id", "advertiser-id"].iter().map(|v|*v)); + v.extend(["advertiser-id", "partner-id"].iter().map(|v|*v)); v } )); } } @@ -7306,7 +7306,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["partner-id", "advertiser-id", "page-token", "filter", "page-size", "order-by"].iter().map(|v|*v)); + v.extend(["advertiser-id", "filter", "order-by", "page-size", "page-token", "partner-id"].iter().map(|v|*v)); v } )); } } @@ -7400,7 +7400,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["partner-id", "advertiser-id"].iter().map(|v|*v)); + v.extend(["advertiser-id", "partner-id"].iter().map(|v|*v)); v } )); } } @@ -7459,7 +7459,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["partner-id", "advertiser-id"].iter().map(|v|*v)); + v.extend(["advertiser-id", "partner-id"].iter().map(|v|*v)); v } )); } } @@ -7518,7 +7518,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["partner-id", "advertiser-id"].iter().map(|v|*v)); + v.extend(["advertiser-id", "partner-id"].iter().map(|v|*v)); v } )); } } @@ -7589,7 +7589,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["partner-id", "advertiser-id", "page-token", "filter", "page-size", "order-by"].iter().map(|v|*v)); + v.extend(["advertiser-id", "filter", "order-by", "page-size", "page-token", "partner-id"].iter().map(|v|*v)); v } )); } } @@ -7686,7 +7686,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["update-mask", "partner-id", "advertiser-id"].iter().map(|v|*v)); + v.extend(["advertiser-id", "partner-id", "update-mask"].iter().map(|v|*v)); v } )); } } @@ -7813,7 +7813,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["partner-id", "advertiser-id", "page-token", "filter", "page-size", "order-by"].iter().map(|v|*v)); + v.extend(["advertiser-id", "filter", "order-by", "page-size", "page-token", "partner-id"].iter().map(|v|*v)); v } )); } } @@ -8176,7 +8176,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["advertiser-id", "page-token", "filter", "page-size", "order-by"].iter().map(|v|*v)); + v.extend(["advertiser-id", "filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -8272,7 +8272,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["update-mask", "advertiser-id"].iter().map(|v|*v)); + v.extend(["advertiser-id", "update-mask"].iter().map(|v|*v)); v } )); } } @@ -8573,7 +8573,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["advertiser-id", "page-token", "filter", "page-size", "order-by"].iter().map(|v|*v)); + v.extend(["advertiser-id", "filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -8776,7 +8776,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -9143,7 +9143,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -9416,7 +9416,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["advertiser-id", "page-token", "filter", "page-size", "order-by"].iter().map(|v|*v)); + v.extend(["advertiser-id", "filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -9846,7 +9846,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/displayvideo1/src/api.rs b/gen/displayvideo1/src/api.rs index 6e18ba6be3..36355758c3 100644 --- a/gen/displayvideo1/src/api.rs +++ b/gen/displayvideo1/src/api.rs @@ -9029,25 +9029,15 @@ impl<'a, C> AdvertiserAssetUploadCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9055,13 +9045,15 @@ impl<'a, C> AdvertiserAssetUploadCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9321,25 +9313,15 @@ impl<'a, C> AdvertiserCampaignTargetingTypeAssignedTargetingOptionGetCall<'a, C> return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9347,13 +9329,15 @@ impl<'a, C> AdvertiserCampaignTargetingTypeAssignedTargetingOptionGetCall<'a, C> } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9642,25 +9626,15 @@ impl<'a, C> AdvertiserCampaignTargetingTypeAssignedTargetingOptionListCall<'a, C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9668,13 +9642,15 @@ impl<'a, C> AdvertiserCampaignTargetingTypeAssignedTargetingOptionListCall<'a, C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9979,25 +9955,15 @@ impl<'a, C> AdvertiserCampaignBulkListCampaignAssignedTargetingOptionCall<'a, C> return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10005,13 +9971,15 @@ impl<'a, C> AdvertiserCampaignBulkListCampaignAssignedTargetingOptionCall<'a, C> } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10305,25 +10273,15 @@ impl<'a, C> AdvertiserCampaignCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10331,13 +10289,15 @@ impl<'a, C> AdvertiserCampaignCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10583,25 +10543,15 @@ impl<'a, C> AdvertiserCampaignDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10609,13 +10559,15 @@ impl<'a, C> AdvertiserCampaignDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10862,25 +10814,15 @@ impl<'a, C> AdvertiserCampaignGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10888,13 +10830,15 @@ impl<'a, C> AdvertiserCampaignGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11159,25 +11103,15 @@ impl<'a, C> AdvertiserCampaignListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11185,13 +11119,15 @@ impl<'a, C> AdvertiserCampaignListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11482,25 +11418,15 @@ impl<'a, C> AdvertiserCampaignPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11508,13 +11434,15 @@ impl<'a, C> AdvertiserCampaignPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11798,25 +11726,15 @@ impl<'a, C> AdvertiserChannelSiteBulkEditCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11824,13 +11742,15 @@ impl<'a, C> AdvertiserChannelSiteBulkEditCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12112,25 +12032,15 @@ impl<'a, C> AdvertiserChannelSiteCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12138,13 +12048,15 @@ impl<'a, C> AdvertiserChannelSiteCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12414,25 +12326,15 @@ impl<'a, C> AdvertiserChannelSiteDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12440,13 +12342,15 @@ impl<'a, C> AdvertiserChannelSiteDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12735,25 +12639,15 @@ impl<'a, C> AdvertiserChannelSiteListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12761,13 +12655,15 @@ impl<'a, C> AdvertiserChannelSiteListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13070,25 +12966,15 @@ impl<'a, C> AdvertiserChannelSiteReplaceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13096,13 +12982,15 @@ impl<'a, C> AdvertiserChannelSiteReplaceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13382,25 +13270,15 @@ impl<'a, C> AdvertiserChannelCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13408,13 +13286,15 @@ impl<'a, C> AdvertiserChannelCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13672,25 +13552,15 @@ impl<'a, C> AdvertiserChannelGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13698,13 +13568,15 @@ impl<'a, C> AdvertiserChannelGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13981,25 +13853,15 @@ impl<'a, C> AdvertiserChannelListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14007,13 +13869,15 @@ impl<'a, C> AdvertiserChannelListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14316,25 +14180,15 @@ impl<'a, C> AdvertiserChannelPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14342,13 +14196,15 @@ impl<'a, C> AdvertiserChannelPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14637,25 +14493,15 @@ impl<'a, C> AdvertiserCreativeCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14663,13 +14509,15 @@ impl<'a, C> AdvertiserCreativeCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14915,25 +14763,15 @@ impl<'a, C> AdvertiserCreativeDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14941,13 +14779,15 @@ impl<'a, C> AdvertiserCreativeDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15194,25 +15034,15 @@ impl<'a, C> AdvertiserCreativeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15220,13 +15050,15 @@ impl<'a, C> AdvertiserCreativeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15491,25 +15323,15 @@ impl<'a, C> AdvertiserCreativeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15517,13 +15339,15 @@ impl<'a, C> AdvertiserCreativeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15814,25 +15638,15 @@ impl<'a, C> AdvertiserCreativePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15840,13 +15654,15 @@ impl<'a, C> AdvertiserCreativePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16113,25 +15929,15 @@ impl<'a, C> AdvertiserInsertionOrderTargetingTypeAssignedTargetingOptionGetCall< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16139,13 +15945,15 @@ impl<'a, C> AdvertiserInsertionOrderTargetingTypeAssignedTargetingOptionGetCall< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16434,25 +16242,15 @@ impl<'a, C> AdvertiserInsertionOrderTargetingTypeAssignedTargetingOptionListCall return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16460,13 +16258,15 @@ impl<'a, C> AdvertiserInsertionOrderTargetingTypeAssignedTargetingOptionListCall } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16771,25 +16571,15 @@ impl<'a, C> AdvertiserInsertionOrderBulkListInsertionOrderAssignedTargetingOptio return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16797,13 +16587,15 @@ impl<'a, C> AdvertiserInsertionOrderBulkListInsertionOrderAssignedTargetingOptio } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17097,25 +16889,15 @@ impl<'a, C> AdvertiserInsertionOrderCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17123,13 +16905,15 @@ impl<'a, C> AdvertiserInsertionOrderCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17375,25 +17159,15 @@ impl<'a, C> AdvertiserInsertionOrderDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17401,13 +17175,15 @@ impl<'a, C> AdvertiserInsertionOrderDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17654,25 +17430,15 @@ impl<'a, C> AdvertiserInsertionOrderGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17680,13 +17446,15 @@ impl<'a, C> AdvertiserInsertionOrderGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17951,25 +17719,15 @@ impl<'a, C> AdvertiserInsertionOrderListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17977,13 +17735,15 @@ impl<'a, C> AdvertiserInsertionOrderListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18274,25 +18034,15 @@ impl<'a, C> AdvertiserInsertionOrderPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18300,13 +18050,15 @@ impl<'a, C> AdvertiserInsertionOrderPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18592,25 +18344,15 @@ impl<'a, C> AdvertiserLineItemTargetingTypeAssignedTargetingOptionCreateCall<'a, return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18618,13 +18360,15 @@ impl<'a, C> AdvertiserLineItemTargetingTypeAssignedTargetingOptionCreateCall<'a, } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18894,25 +18638,15 @@ impl<'a, C> AdvertiserLineItemTargetingTypeAssignedTargetingOptionDeleteCall<'a, return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18920,13 +18654,15 @@ impl<'a, C> AdvertiserLineItemTargetingTypeAssignedTargetingOptionDeleteCall<'a, } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19197,25 +18933,15 @@ impl<'a, C> AdvertiserLineItemTargetingTypeAssignedTargetingOptionGetCall<'a, C> return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19223,13 +18949,15 @@ impl<'a, C> AdvertiserLineItemTargetingTypeAssignedTargetingOptionGetCall<'a, C> } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19518,25 +19246,15 @@ impl<'a, C> AdvertiserLineItemTargetingTypeAssignedTargetingOptionListCall<'a, C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19544,13 +19262,15 @@ impl<'a, C> AdvertiserLineItemTargetingTypeAssignedTargetingOptionListCall<'a, C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19856,25 +19576,15 @@ impl<'a, C> AdvertiserLineItemBulkEditLineItemAssignedTargetingOptionCall<'a, C> return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19882,13 +19592,15 @@ impl<'a, C> AdvertiserLineItemBulkEditLineItemAssignedTargetingOptionCall<'a, C> } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20164,25 +19876,15 @@ impl<'a, C> AdvertiserLineItemBulkListLineItemAssignedTargetingOptionCall<'a, C> return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20190,13 +19892,15 @@ impl<'a, C> AdvertiserLineItemBulkListLineItemAssignedTargetingOptionCall<'a, C> } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20490,25 +20194,15 @@ impl<'a, C> AdvertiserLineItemCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20516,13 +20210,15 @@ impl<'a, C> AdvertiserLineItemCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20768,25 +20464,15 @@ impl<'a, C> AdvertiserLineItemDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20794,13 +20480,15 @@ impl<'a, C> AdvertiserLineItemDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21066,25 +20754,15 @@ impl<'a, C> AdvertiserLineItemGenerateDefaultCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21092,13 +20770,15 @@ impl<'a, C> AdvertiserLineItemGenerateDefaultCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21344,25 +21024,15 @@ impl<'a, C> AdvertiserLineItemGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21370,13 +21040,15 @@ impl<'a, C> AdvertiserLineItemGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21641,25 +21313,15 @@ impl<'a, C> AdvertiserLineItemListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21667,13 +21329,15 @@ impl<'a, C> AdvertiserLineItemListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21964,25 +21628,15 @@ impl<'a, C> AdvertiserLineItemPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21990,13 +21644,15 @@ impl<'a, C> AdvertiserLineItemPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22280,25 +21936,15 @@ impl<'a, C> AdvertiserLocationListAssignedLocationBulkEditCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22306,13 +21952,15 @@ impl<'a, C> AdvertiserLocationListAssignedLocationBulkEditCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22585,25 +22233,15 @@ impl<'a, C> AdvertiserLocationListAssignedLocationCreateCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22611,13 +22249,15 @@ impl<'a, C> AdvertiserLocationListAssignedLocationCreateCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22875,25 +22515,15 @@ impl<'a, C> AdvertiserLocationListAssignedLocationDeleteCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22901,13 +22531,15 @@ impl<'a, C> AdvertiserLocationListAssignedLocationDeleteCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23180,25 +22812,15 @@ impl<'a, C> AdvertiserLocationListAssignedLocationListCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23206,13 +22828,15 @@ impl<'a, C> AdvertiserLocationListAssignedLocationListCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23506,25 +23130,15 @@ impl<'a, C> AdvertiserLocationListCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23532,13 +23146,15 @@ impl<'a, C> AdvertiserLocationListCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23784,25 +23400,15 @@ impl<'a, C> AdvertiserLocationListGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23810,13 +23416,15 @@ impl<'a, C> AdvertiserLocationListGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24081,25 +23689,15 @@ impl<'a, C> AdvertiserLocationListListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24107,13 +23705,15 @@ impl<'a, C> AdvertiserLocationListListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24404,25 +24004,15 @@ impl<'a, C> AdvertiserLocationListPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24430,13 +24020,15 @@ impl<'a, C> AdvertiserLocationListPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24720,25 +24312,15 @@ impl<'a, C> AdvertiserManualTriggerActivateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24746,13 +24328,15 @@ impl<'a, C> AdvertiserManualTriggerActivateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25027,25 +24611,15 @@ impl<'a, C> AdvertiserManualTriggerCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25053,13 +24627,15 @@ impl<'a, C> AdvertiserManualTriggerCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25326,25 +24902,15 @@ impl<'a, C> AdvertiserManualTriggerDeactivateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25352,13 +24918,15 @@ impl<'a, C> AdvertiserManualTriggerDeactivateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25614,25 +25182,15 @@ impl<'a, C> AdvertiserManualTriggerGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25640,13 +25198,15 @@ impl<'a, C> AdvertiserManualTriggerGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25911,25 +25471,15 @@ impl<'a, C> AdvertiserManualTriggerListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25937,13 +25487,15 @@ impl<'a, C> AdvertiserManualTriggerListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26234,25 +25786,15 @@ impl<'a, C> AdvertiserManualTriggerPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26260,13 +25802,15 @@ impl<'a, C> AdvertiserManualTriggerPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26550,25 +26094,15 @@ impl<'a, C> AdvertiserNegativeKeywordListNegativeKeywordBulkEditCall<'a, C> wher return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26576,13 +26110,15 @@ impl<'a, C> AdvertiserNegativeKeywordListNegativeKeywordBulkEditCall<'a, C> wher } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26859,25 +26395,15 @@ impl<'a, C> AdvertiserNegativeKeywordListNegativeKeywordCreateCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26885,13 +26411,15 @@ impl<'a, C> AdvertiserNegativeKeywordListNegativeKeywordCreateCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27149,25 +26677,15 @@ impl<'a, C> AdvertiserNegativeKeywordListNegativeKeywordDeleteCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27175,13 +26693,15 @@ impl<'a, C> AdvertiserNegativeKeywordListNegativeKeywordDeleteCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27458,25 +26978,15 @@ impl<'a, C> AdvertiserNegativeKeywordListNegativeKeywordListCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27484,13 +26994,15 @@ impl<'a, C> AdvertiserNegativeKeywordListNegativeKeywordListCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27786,25 +27298,15 @@ impl<'a, C> AdvertiserNegativeKeywordListNegativeKeywordReplaceCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27812,13 +27314,15 @@ impl<'a, C> AdvertiserNegativeKeywordListNegativeKeywordReplaceCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28093,25 +27597,15 @@ impl<'a, C> AdvertiserNegativeKeywordListCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28119,13 +27613,15 @@ impl<'a, C> AdvertiserNegativeKeywordListCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28371,25 +27867,15 @@ impl<'a, C> AdvertiserNegativeKeywordListDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28397,13 +27883,15 @@ impl<'a, C> AdvertiserNegativeKeywordListDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28650,25 +28138,15 @@ impl<'a, C> AdvertiserNegativeKeywordListGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28676,13 +28154,15 @@ impl<'a, C> AdvertiserNegativeKeywordListGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28937,25 +28417,15 @@ impl<'a, C> AdvertiserNegativeKeywordListListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28963,13 +28433,15 @@ impl<'a, C> AdvertiserNegativeKeywordListListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29246,25 +28718,15 @@ impl<'a, C> AdvertiserNegativeKeywordListPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29272,13 +28734,15 @@ impl<'a, C> AdvertiserNegativeKeywordListPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29562,25 +29026,15 @@ impl<'a, C> AdvertiserTargetingTypeAssignedTargetingOptionCreateCall<'a, C> wher return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29588,13 +29042,15 @@ impl<'a, C> AdvertiserTargetingTypeAssignedTargetingOptionCreateCall<'a, C> wher } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29852,25 +29308,15 @@ impl<'a, C> AdvertiserTargetingTypeAssignedTargetingOptionDeleteCall<'a, C> wher return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29878,13 +29324,15 @@ impl<'a, C> AdvertiserTargetingTypeAssignedTargetingOptionDeleteCall<'a, C> wher } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30143,25 +29591,15 @@ impl<'a, C> AdvertiserTargetingTypeAssignedTargetingOptionGetCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30169,13 +29607,15 @@ impl<'a, C> AdvertiserTargetingTypeAssignedTargetingOptionGetCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30452,25 +29892,15 @@ impl<'a, C> AdvertiserTargetingTypeAssignedTargetingOptionListCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30478,13 +29908,15 @@ impl<'a, C> AdvertiserTargetingTypeAssignedTargetingOptionListCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30762,25 +30194,15 @@ impl<'a, C> AdvertiserAuditCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30788,13 +30210,15 @@ impl<'a, C> AdvertiserAuditCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31057,25 +30481,15 @@ impl<'a, C> AdvertiserBulkEditAdvertiserAssignedTargetingOptionCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31083,13 +30497,15 @@ impl<'a, C> AdvertiserBulkEditAdvertiserAssignedTargetingOptionCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31353,25 +30769,15 @@ impl<'a, C> AdvertiserBulkListAdvertiserAssignedTargetingOptionCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31379,13 +30785,15 @@ impl<'a, C> AdvertiserBulkListAdvertiserAssignedTargetingOptionCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31642,25 +31050,15 @@ impl<'a, C> AdvertiserCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31668,13 +31066,15 @@ impl<'a, C> AdvertiserCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31908,25 +31308,15 @@ impl<'a, C> AdvertiserDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31934,13 +31324,15 @@ impl<'a, C> AdvertiserDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32175,25 +31567,15 @@ impl<'a, C> AdvertiserGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32201,13 +31583,15 @@ impl<'a, C> AdvertiserGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32440,25 +31824,15 @@ impl<'a, C> AdvertiserListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32466,13 +31840,15 @@ impl<'a, C> AdvertiserListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32758,25 +32134,15 @@ impl<'a, C> AdvertiserPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32784,13 +32150,15 @@ impl<'a, C> AdvertiserPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33051,25 +32419,15 @@ impl<'a, C> CombinedAudienceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33077,13 +32435,15 @@ impl<'a, C> CombinedAudienceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33335,25 +32695,15 @@ impl<'a, C> CombinedAudienceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33361,13 +32711,15 @@ impl<'a, C> CombinedAudienceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33644,25 +32996,15 @@ impl<'a, C> CustomBiddingAlgorithmGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33670,13 +33012,15 @@ impl<'a, C> CustomBiddingAlgorithmGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33928,25 +33272,15 @@ impl<'a, C> CustomBiddingAlgorithmListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33954,13 +33288,15 @@ impl<'a, C> CustomBiddingAlgorithmListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34232,25 +33568,15 @@ impl<'a, C> CustomListGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34258,13 +33584,15 @@ impl<'a, C> CustomListGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34504,25 +33832,15 @@ impl<'a, C> CustomListListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34530,13 +33848,15 @@ impl<'a, C> CustomListListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34806,25 +34126,15 @@ impl<'a, C> FirstAndThirdPartyAudienceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34832,13 +34142,15 @@ impl<'a, C> FirstAndThirdPartyAudienceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35090,25 +34402,15 @@ impl<'a, C> FirstAndThirdPartyAudienceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35116,13 +34418,15 @@ impl<'a, C> FirstAndThirdPartyAudienceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35394,25 +34698,15 @@ impl<'a, C> FloodlightGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35420,13 +34714,15 @@ impl<'a, C> FloodlightGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35695,25 +34991,15 @@ impl<'a, C> FloodlightGroupPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35721,13 +35007,15 @@ impl<'a, C> FloodlightGroupPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35995,25 +35283,15 @@ impl<'a, C> GoogleAudienceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36021,13 +35299,15 @@ impl<'a, C> GoogleAudienceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36279,25 +35559,15 @@ impl<'a, C> GoogleAudienceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36305,13 +35575,15 @@ impl<'a, C> GoogleAudienceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36599,25 +35871,15 @@ impl<'a, C> InventorySourceGroupAssignedInventorySourceBulkEditCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36625,13 +35887,15 @@ impl<'a, C> InventorySourceGroupAssignedInventorySourceBulkEditCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36906,25 +36170,15 @@ impl<'a, C> InventorySourceGroupAssignedInventorySourceCreateCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36932,13 +36186,15 @@ impl<'a, C> InventorySourceGroupAssignedInventorySourceCreateCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37208,25 +36464,15 @@ impl<'a, C> InventorySourceGroupAssignedInventorySourceDeleteCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37234,13 +36480,15 @@ impl<'a, C> InventorySourceGroupAssignedInventorySourceDeleteCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37529,25 +36777,15 @@ impl<'a, C> InventorySourceGroupAssignedInventorySourceListCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37555,13 +36793,15 @@ impl<'a, C> InventorySourceGroupAssignedInventorySourceListCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37842,25 +37082,15 @@ impl<'a, C> InventorySourceGroupCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37868,13 +37098,15 @@ impl<'a, C> InventorySourceGroupCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38132,25 +37364,15 @@ impl<'a, C> InventorySourceGroupDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38158,13 +37380,15 @@ impl<'a, C> InventorySourceGroupDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38423,25 +37647,15 @@ impl<'a, C> InventorySourceGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38449,13 +37663,15 @@ impl<'a, C> InventorySourceGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38707,25 +37923,15 @@ impl<'a, C> InventorySourceGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38733,13 +37939,15 @@ impl<'a, C> InventorySourceGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39038,25 +38246,15 @@ impl<'a, C> InventorySourceGroupPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39064,13 +38262,15 @@ impl<'a, C> InventorySourceGroupPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39340,25 +38540,15 @@ impl<'a, C> InventorySourceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39366,13 +38556,15 @@ impl<'a, C> InventorySourceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39617,25 +38809,15 @@ impl<'a, C> InventorySourceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39643,13 +38825,15 @@ impl<'a, C> InventorySourceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39937,25 +39121,15 @@ impl<'a, C> MediaDownloadCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39963,19 +39137,21 @@ impl<'a, C> MediaDownloadCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = if enable_resource_parsing { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); } } - } else { (reconstructed_result, Default::default()) }; + } else { (res, Default::default()) }; dlg.finished(true); return Ok(result_value) @@ -40227,25 +39403,15 @@ impl<'a, C> PartnerChannelSiteBulkEditCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40253,13 +39419,15 @@ impl<'a, C> PartnerChannelSiteBulkEditCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40541,25 +39709,15 @@ impl<'a, C> PartnerChannelSiteCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40567,13 +39725,15 @@ impl<'a, C> PartnerChannelSiteCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40843,25 +40003,15 @@ impl<'a, C> PartnerChannelSiteDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40869,13 +40019,15 @@ impl<'a, C> PartnerChannelSiteDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41164,25 +40316,15 @@ impl<'a, C> PartnerChannelSiteListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41190,13 +40332,15 @@ impl<'a, C> PartnerChannelSiteListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41499,25 +40643,15 @@ impl<'a, C> PartnerChannelSiteReplaceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41525,13 +40659,15 @@ impl<'a, C> PartnerChannelSiteReplaceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41811,25 +40947,15 @@ impl<'a, C> PartnerChannelCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41837,13 +40963,15 @@ impl<'a, C> PartnerChannelCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42101,25 +41229,15 @@ impl<'a, C> PartnerChannelGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42127,13 +41245,15 @@ impl<'a, C> PartnerChannelGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42410,25 +41530,15 @@ impl<'a, C> PartnerChannelListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42436,13 +41546,15 @@ impl<'a, C> PartnerChannelListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42745,25 +41857,15 @@ impl<'a, C> PartnerChannelPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42771,13 +41873,15 @@ impl<'a, C> PartnerChannelPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43068,25 +42172,15 @@ impl<'a, C> PartnerTargetingTypeAssignedTargetingOptionCreateCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43094,13 +42188,15 @@ impl<'a, C> PartnerTargetingTypeAssignedTargetingOptionCreateCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43358,25 +42454,15 @@ impl<'a, C> PartnerTargetingTypeAssignedTargetingOptionDeleteCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43384,13 +42470,15 @@ impl<'a, C> PartnerTargetingTypeAssignedTargetingOptionDeleteCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43649,25 +42737,15 @@ impl<'a, C> PartnerTargetingTypeAssignedTargetingOptionGetCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43675,13 +42753,15 @@ impl<'a, C> PartnerTargetingTypeAssignedTargetingOptionGetCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43958,25 +43038,15 @@ impl<'a, C> PartnerTargetingTypeAssignedTargetingOptionListCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43984,13 +43054,15 @@ impl<'a, C> PartnerTargetingTypeAssignedTargetingOptionListCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44284,25 +43356,15 @@ impl<'a, C> PartnerBulkEditPartnerAssignedTargetingOptionCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44310,13 +43372,15 @@ impl<'a, C> PartnerBulkEditPartnerAssignedTargetingOptionCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44560,25 +43624,15 @@ impl<'a, C> PartnerGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44586,13 +43640,15 @@ impl<'a, C> PartnerGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44820,25 +43876,15 @@ impl<'a, C> PartnerListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44846,13 +43892,15 @@ impl<'a, C> PartnerListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45105,25 +44153,15 @@ impl<'a, C> SdfdownloadtaskOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45131,13 +44169,15 @@ impl<'a, C> SdfdownloadtaskOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45366,25 +44406,15 @@ impl<'a, C> SdfdownloadtaskCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45392,13 +44422,15 @@ impl<'a, C> SdfdownloadtaskCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45639,25 +44671,15 @@ impl<'a, C> TargetingTypeTargetingOptionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45665,13 +44687,15 @@ impl<'a, C> TargetingTypeTargetingOptionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45948,25 +44972,15 @@ impl<'a, C> TargetingTypeTargetingOptionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45974,13 +44988,15 @@ impl<'a, C> TargetingTypeTargetingOptionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46271,25 +45287,15 @@ impl<'a, C> TargetingTypeTargetingOptionSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46297,13 +45303,15 @@ impl<'a, C> TargetingTypeTargetingOptionSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46568,25 +45576,15 @@ impl<'a, C> UserBulkEditAssignedUserRoleCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46594,13 +45592,15 @@ impl<'a, C> UserBulkEditAssignedUserRoleCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46838,25 +45838,15 @@ impl<'a, C> UserCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46864,13 +45854,15 @@ impl<'a, C> UserCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47104,25 +46096,15 @@ impl<'a, C> UserDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47130,13 +46112,15 @@ impl<'a, C> UserDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47371,25 +46355,15 @@ impl<'a, C> UserGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47397,13 +46371,15 @@ impl<'a, C> UserGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47631,25 +46607,15 @@ impl<'a, C> UserListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47657,13 +46623,15 @@ impl<'a, C> UserListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47942,25 +46910,15 @@ impl<'a, C> UserPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47968,13 +46926,15 @@ impl<'a, C> UserPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/displayvideo1/src/client.rs b/gen/displayvideo1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/displayvideo1/src/client.rs +++ b/gen/displayvideo1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/dlp2-cli/src/main.rs b/gen/dlp2-cli/src/main.rs index eb74f34bbf..2f59a5fe60 100644 --- a/gen/dlp2-cli/src/main.rs +++ b/gen/dlp2-cli/src/main.rs @@ -73,7 +73,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["location-id", "filter", "language-code", "parent"].iter().map(|v|*v)); + v.extend(["filter", "language-code", "location-id", "parent"].iter().map(|v|*v)); v } )); } } @@ -135,7 +135,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["location-id", "filter", "language-code"].iter().map(|v|*v)); + v.extend(["filter", "language-code", "location-id"].iter().map(|v|*v)); v } )); } } @@ -395,7 +395,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "location-id", "page-token", "order-by"].iter().map(|v|*v)); + v.extend(["location-id", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -751,7 +751,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "location-id", "page-token", "order-by"].iter().map(|v|*v)); + v.extend(["location-id", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1107,7 +1107,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "location-id", "page-token", "order-by"].iter().map(|v|*v)); + v.extend(["location-id", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1268,7 +1268,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "page-token", "type", "location-id", "page-size", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "location-id", "order-by", "page-size", "page-token", "type"].iter().map(|v|*v)); v } )); } } @@ -1534,7 +1534,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "location-id", "page-token", "order-by"].iter().map(|v|*v)); + v.extend(["location-id", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1927,7 +1927,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "page-token", "location-id", "page-size", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "location-id", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2318,7 +2318,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "location-id", "page-token", "order-by"].iter().map(|v|*v)); + v.extend(["location-id", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2682,7 +2682,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "location-id", "page-token", "order-by"].iter().map(|v|*v)); + v.extend(["location-id", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3326,7 +3326,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "location-id", "page-token", "order-by"].iter().map(|v|*v)); + v.extend(["location-id", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3802,7 +3802,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "page-token", "type", "location-id", "page-size", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "location-id", "order-by", "page-size", "page-token", "type"].iter().map(|v|*v)); v } )); } } @@ -4162,7 +4162,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "location-id", "page-token", "order-by"].iter().map(|v|*v)); + v.extend(["location-id", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -4639,7 +4639,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "page-token", "location-id", "page-size", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "location-id", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -5310,7 +5310,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "location-id", "page-token", "order-by"].iter().map(|v|*v)); + v.extend(["location-id", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -5967,7 +5967,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "page-token", "type", "location-id", "page-size", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "location-id", "order-by", "page-size", "page-token", "type"].iter().map(|v|*v)); v } )); } } @@ -6327,7 +6327,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "location-id", "page-token", "order-by"].iter().map(|v|*v)); + v.extend(["location-id", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -6901,7 +6901,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "page-token", "location-id", "page-size", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "location-id", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -7292,7 +7292,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "location-id", "page-token", "order-by"].iter().map(|v|*v)); + v.extend(["location-id", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -7656,7 +7656,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "location-id", "page-token", "order-by"].iter().map(|v|*v)); + v.extend(["location-id", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/dlp2/src/api.rs b/gen/dlp2/src/api.rs index a7d653249d..e5628b739c 100644 --- a/gen/dlp2/src/api.rs +++ b/gen/dlp2/src/api.rs @@ -6201,25 +6201,15 @@ impl<'a, C> InfoTypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6227,13 +6217,15 @@ impl<'a, C> InfoTypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6501,25 +6493,15 @@ impl<'a, C> LocationInfoTypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6527,13 +6509,15 @@ impl<'a, C> LocationInfoTypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6810,25 +6794,15 @@ impl<'a, C> OrganizationDeidentifyTemplateCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6836,13 +6810,15 @@ impl<'a, C> OrganizationDeidentifyTemplateCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7086,25 +7062,15 @@ impl<'a, C> OrganizationDeidentifyTemplateDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7112,13 +7078,15 @@ impl<'a, C> OrganizationDeidentifyTemplateDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7353,25 +7321,15 @@ impl<'a, C> OrganizationDeidentifyTemplateGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7379,13 +7337,15 @@ impl<'a, C> OrganizationDeidentifyTemplateGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7640,25 +7600,15 @@ impl<'a, C> OrganizationDeidentifyTemplateListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7666,13 +7616,15 @@ impl<'a, C> OrganizationDeidentifyTemplateListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7956,25 +7908,15 @@ impl<'a, C> OrganizationDeidentifyTemplatePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7982,13 +7924,15 @@ impl<'a, C> OrganizationDeidentifyTemplatePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8253,25 +8197,15 @@ impl<'a, C> OrganizationInspectTemplateCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8279,13 +8213,15 @@ impl<'a, C> OrganizationInspectTemplateCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8529,25 +8465,15 @@ impl<'a, C> OrganizationInspectTemplateDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8555,13 +8481,15 @@ impl<'a, C> OrganizationInspectTemplateDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8796,25 +8724,15 @@ impl<'a, C> OrganizationInspectTemplateGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8822,13 +8740,15 @@ impl<'a, C> OrganizationInspectTemplateGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9083,25 +9003,15 @@ impl<'a, C> OrganizationInspectTemplateListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9109,13 +9019,15 @@ impl<'a, C> OrganizationInspectTemplateListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9399,25 +9311,15 @@ impl<'a, C> OrganizationInspectTemplatePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9425,13 +9327,15 @@ impl<'a, C> OrganizationInspectTemplatePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9696,25 +9600,15 @@ impl<'a, C> OrganizationLocationDeidentifyTemplateCreateCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9722,13 +9616,15 @@ impl<'a, C> OrganizationLocationDeidentifyTemplateCreateCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9972,25 +9868,15 @@ impl<'a, C> OrganizationLocationDeidentifyTemplateDeleteCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9998,13 +9884,15 @@ impl<'a, C> OrganizationLocationDeidentifyTemplateDeleteCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10239,25 +10127,15 @@ impl<'a, C> OrganizationLocationDeidentifyTemplateGetCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10265,13 +10143,15 @@ impl<'a, C> OrganizationLocationDeidentifyTemplateGetCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10526,25 +10406,15 @@ impl<'a, C> OrganizationLocationDeidentifyTemplateListCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10552,13 +10422,15 @@ impl<'a, C> OrganizationLocationDeidentifyTemplateListCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10842,25 +10714,15 @@ impl<'a, C> OrganizationLocationDeidentifyTemplatePatchCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10868,13 +10730,15 @@ impl<'a, C> OrganizationLocationDeidentifyTemplatePatchCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11148,25 +11012,15 @@ impl<'a, C> OrganizationLocationDlpJobListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11174,13 +11028,15 @@ impl<'a, C> OrganizationLocationDlpJobListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11478,25 +11334,15 @@ impl<'a, C> OrganizationLocationInspectTemplateCreateCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11504,13 +11350,15 @@ impl<'a, C> OrganizationLocationInspectTemplateCreateCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11754,25 +11602,15 @@ impl<'a, C> OrganizationLocationInspectTemplateDeleteCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11780,13 +11618,15 @@ impl<'a, C> OrganizationLocationInspectTemplateDeleteCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12021,25 +11861,15 @@ impl<'a, C> OrganizationLocationInspectTemplateGetCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12047,13 +11877,15 @@ impl<'a, C> OrganizationLocationInspectTemplateGetCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12308,25 +12140,15 @@ impl<'a, C> OrganizationLocationInspectTemplateListCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12334,13 +12156,15 @@ impl<'a, C> OrganizationLocationInspectTemplateListCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12624,25 +12448,15 @@ impl<'a, C> OrganizationLocationInspectTemplatePatchCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12650,13 +12464,15 @@ impl<'a, C> OrganizationLocationInspectTemplatePatchCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12921,25 +12737,15 @@ impl<'a, C> OrganizationLocationJobTriggerCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12947,13 +12753,15 @@ impl<'a, C> OrganizationLocationJobTriggerCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13197,25 +13005,15 @@ impl<'a, C> OrganizationLocationJobTriggerDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13223,13 +13021,15 @@ impl<'a, C> OrganizationLocationJobTriggerDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13464,25 +13264,15 @@ impl<'a, C> OrganizationLocationJobTriggerGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13490,13 +13280,15 @@ impl<'a, C> OrganizationLocationJobTriggerGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13756,25 +13548,15 @@ impl<'a, C> OrganizationLocationJobTriggerListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13782,13 +13564,15 @@ impl<'a, C> OrganizationLocationJobTriggerListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14079,25 +13863,15 @@ impl<'a, C> OrganizationLocationJobTriggerPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14105,13 +13879,15 @@ impl<'a, C> OrganizationLocationJobTriggerPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14376,25 +14152,15 @@ impl<'a, C> OrganizationLocationStoredInfoTypeCreateCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14402,13 +14168,15 @@ impl<'a, C> OrganizationLocationStoredInfoTypeCreateCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14652,25 +14420,15 @@ impl<'a, C> OrganizationLocationStoredInfoTypeDeleteCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14678,13 +14436,15 @@ impl<'a, C> OrganizationLocationStoredInfoTypeDeleteCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14919,25 +14679,15 @@ impl<'a, C> OrganizationLocationStoredInfoTypeGetCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14945,13 +14695,15 @@ impl<'a, C> OrganizationLocationStoredInfoTypeGetCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15206,25 +14958,15 @@ impl<'a, C> OrganizationLocationStoredInfoTypeListCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15232,13 +14974,15 @@ impl<'a, C> OrganizationLocationStoredInfoTypeListCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15522,25 +15266,15 @@ impl<'a, C> OrganizationLocationStoredInfoTypePatchCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15548,13 +15282,15 @@ impl<'a, C> OrganizationLocationStoredInfoTypePatchCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15819,25 +15555,15 @@ impl<'a, C> OrganizationStoredInfoTypeCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15845,13 +15571,15 @@ impl<'a, C> OrganizationStoredInfoTypeCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16095,25 +15823,15 @@ impl<'a, C> OrganizationStoredInfoTypeDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16121,13 +15839,15 @@ impl<'a, C> OrganizationStoredInfoTypeDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16362,25 +16082,15 @@ impl<'a, C> OrganizationStoredInfoTypeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16388,13 +16098,15 @@ impl<'a, C> OrganizationStoredInfoTypeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16649,25 +16361,15 @@ impl<'a, C> OrganizationStoredInfoTypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16675,13 +16377,15 @@ impl<'a, C> OrganizationStoredInfoTypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16965,25 +16669,15 @@ impl<'a, C> OrganizationStoredInfoTypePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16991,13 +16685,15 @@ impl<'a, C> OrganizationStoredInfoTypePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17262,25 +16958,15 @@ impl<'a, C> ProjectContentDeidentifyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17288,13 +16974,15 @@ impl<'a, C> ProjectContentDeidentifyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17559,25 +17247,15 @@ impl<'a, C> ProjectContentInspectCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17585,13 +17263,15 @@ impl<'a, C> ProjectContentInspectCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17856,25 +17536,15 @@ impl<'a, C> ProjectContentReidentifyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17882,13 +17552,15 @@ impl<'a, C> ProjectContentReidentifyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18153,25 +17825,15 @@ impl<'a, C> ProjectDeidentifyTemplateCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18179,13 +17841,15 @@ impl<'a, C> ProjectDeidentifyTemplateCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18429,25 +18093,15 @@ impl<'a, C> ProjectDeidentifyTemplateDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18455,13 +18109,15 @@ impl<'a, C> ProjectDeidentifyTemplateDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18696,25 +18352,15 @@ impl<'a, C> ProjectDeidentifyTemplateGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18722,13 +18368,15 @@ impl<'a, C> ProjectDeidentifyTemplateGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18983,25 +18631,15 @@ impl<'a, C> ProjectDeidentifyTemplateListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19009,13 +18647,15 @@ impl<'a, C> ProjectDeidentifyTemplateListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19299,25 +18939,15 @@ impl<'a, C> ProjectDeidentifyTemplatePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19325,13 +18955,15 @@ impl<'a, C> ProjectDeidentifyTemplatePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19596,25 +19228,15 @@ impl<'a, C> ProjectDlpJobCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19622,13 +19244,15 @@ impl<'a, C> ProjectDlpJobCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19893,25 +19517,15 @@ impl<'a, C> ProjectDlpJobCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19919,13 +19533,15 @@ impl<'a, C> ProjectDlpJobCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20169,25 +19785,15 @@ impl<'a, C> ProjectDlpJobDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20195,13 +19801,15 @@ impl<'a, C> ProjectDlpJobDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20436,25 +20044,15 @@ impl<'a, C> ProjectDlpJobGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20462,13 +20060,15 @@ impl<'a, C> ProjectDlpJobGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20733,25 +20333,15 @@ impl<'a, C> ProjectDlpJobListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20759,13 +20349,15 @@ impl<'a, C> ProjectDlpJobListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21063,25 +20655,15 @@ impl<'a, C> ProjectImageRedactCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21089,13 +20671,15 @@ impl<'a, C> ProjectImageRedactCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21360,25 +20944,15 @@ impl<'a, C> ProjectInspectTemplateCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21386,13 +20960,15 @@ impl<'a, C> ProjectInspectTemplateCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21636,25 +21212,15 @@ impl<'a, C> ProjectInspectTemplateDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21662,13 +21228,15 @@ impl<'a, C> ProjectInspectTemplateDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21903,25 +21471,15 @@ impl<'a, C> ProjectInspectTemplateGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21929,13 +21487,15 @@ impl<'a, C> ProjectInspectTemplateGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22190,25 +21750,15 @@ impl<'a, C> ProjectInspectTemplateListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22216,13 +21766,15 @@ impl<'a, C> ProjectInspectTemplateListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22506,25 +22058,15 @@ impl<'a, C> ProjectInspectTemplatePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22532,13 +22074,15 @@ impl<'a, C> ProjectInspectTemplatePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22803,25 +22347,15 @@ impl<'a, C> ProjectJobTriggerActivateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22829,13 +22363,15 @@ impl<'a, C> ProjectJobTriggerActivateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23100,25 +22636,15 @@ impl<'a, C> ProjectJobTriggerCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23126,13 +22652,15 @@ impl<'a, C> ProjectJobTriggerCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23376,25 +22904,15 @@ impl<'a, C> ProjectJobTriggerDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23402,13 +22920,15 @@ impl<'a, C> ProjectJobTriggerDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23643,25 +23163,15 @@ impl<'a, C> ProjectJobTriggerGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23669,13 +23179,15 @@ impl<'a, C> ProjectJobTriggerGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23935,25 +23447,15 @@ impl<'a, C> ProjectJobTriggerListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23961,13 +23463,15 @@ impl<'a, C> ProjectJobTriggerListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24258,25 +23762,15 @@ impl<'a, C> ProjectJobTriggerPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24284,13 +23778,15 @@ impl<'a, C> ProjectJobTriggerPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24555,25 +24051,15 @@ impl<'a, C> ProjectLocationContentDeidentifyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24581,13 +24067,15 @@ impl<'a, C> ProjectLocationContentDeidentifyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24852,25 +24340,15 @@ impl<'a, C> ProjectLocationContentInspectCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24878,13 +24356,15 @@ impl<'a, C> ProjectLocationContentInspectCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25149,25 +24629,15 @@ impl<'a, C> ProjectLocationContentReidentifyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25175,13 +24645,15 @@ impl<'a, C> ProjectLocationContentReidentifyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25446,25 +24918,15 @@ impl<'a, C> ProjectLocationDeidentifyTemplateCreateCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25472,13 +24934,15 @@ impl<'a, C> ProjectLocationDeidentifyTemplateCreateCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25722,25 +25186,15 @@ impl<'a, C> ProjectLocationDeidentifyTemplateDeleteCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25748,13 +25202,15 @@ impl<'a, C> ProjectLocationDeidentifyTemplateDeleteCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25989,25 +25445,15 @@ impl<'a, C> ProjectLocationDeidentifyTemplateGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26015,13 +25461,15 @@ impl<'a, C> ProjectLocationDeidentifyTemplateGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26276,25 +25724,15 @@ impl<'a, C> ProjectLocationDeidentifyTemplateListCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26302,13 +25740,15 @@ impl<'a, C> ProjectLocationDeidentifyTemplateListCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26592,25 +26032,15 @@ impl<'a, C> ProjectLocationDeidentifyTemplatePatchCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26618,13 +26048,15 @@ impl<'a, C> ProjectLocationDeidentifyTemplatePatchCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26889,25 +26321,15 @@ impl<'a, C> ProjectLocationDlpJobCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26915,13 +26337,15 @@ impl<'a, C> ProjectLocationDlpJobCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27186,25 +26610,15 @@ impl<'a, C> ProjectLocationDlpJobCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27212,13 +26626,15 @@ impl<'a, C> ProjectLocationDlpJobCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27462,25 +26878,15 @@ impl<'a, C> ProjectLocationDlpJobDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27488,13 +26894,15 @@ impl<'a, C> ProjectLocationDlpJobDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27750,25 +27158,15 @@ impl<'a, C> ProjectLocationDlpJobFinishCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27776,13 +27174,15 @@ impl<'a, C> ProjectLocationDlpJobFinishCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28026,25 +27426,15 @@ impl<'a, C> ProjectLocationDlpJobGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28052,13 +27442,15 @@ impl<'a, C> ProjectLocationDlpJobGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28314,25 +27706,15 @@ impl<'a, C> ProjectLocationDlpJobHybridInspectCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28340,13 +27722,15 @@ impl<'a, C> ProjectLocationDlpJobHybridInspectCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28620,25 +28004,15 @@ impl<'a, C> ProjectLocationDlpJobListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28646,13 +28020,15 @@ impl<'a, C> ProjectLocationDlpJobListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28950,25 +28326,15 @@ impl<'a, C> ProjectLocationImageRedactCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28976,13 +28342,15 @@ impl<'a, C> ProjectLocationImageRedactCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29247,25 +28615,15 @@ impl<'a, C> ProjectLocationInspectTemplateCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29273,13 +28631,15 @@ impl<'a, C> ProjectLocationInspectTemplateCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29523,25 +28883,15 @@ impl<'a, C> ProjectLocationInspectTemplateDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29549,13 +28899,15 @@ impl<'a, C> ProjectLocationInspectTemplateDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29790,25 +29142,15 @@ impl<'a, C> ProjectLocationInspectTemplateGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29816,13 +29158,15 @@ impl<'a, C> ProjectLocationInspectTemplateGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30077,25 +29421,15 @@ impl<'a, C> ProjectLocationInspectTemplateListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30103,13 +29437,15 @@ impl<'a, C> ProjectLocationInspectTemplateListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30393,25 +29729,15 @@ impl<'a, C> ProjectLocationInspectTemplatePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30419,13 +29745,15 @@ impl<'a, C> ProjectLocationInspectTemplatePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30690,25 +30018,15 @@ impl<'a, C> ProjectLocationJobTriggerActivateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30716,13 +30034,15 @@ impl<'a, C> ProjectLocationJobTriggerActivateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30987,25 +30307,15 @@ impl<'a, C> ProjectLocationJobTriggerCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31013,13 +30323,15 @@ impl<'a, C> ProjectLocationJobTriggerCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31263,25 +30575,15 @@ impl<'a, C> ProjectLocationJobTriggerDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31289,13 +30591,15 @@ impl<'a, C> ProjectLocationJobTriggerDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31530,25 +30834,15 @@ impl<'a, C> ProjectLocationJobTriggerGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31556,13 +30850,15 @@ impl<'a, C> ProjectLocationJobTriggerGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31818,25 +31114,15 @@ impl<'a, C> ProjectLocationJobTriggerHybridInspectCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31844,13 +31130,15 @@ impl<'a, C> ProjectLocationJobTriggerHybridInspectCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32119,25 +31407,15 @@ impl<'a, C> ProjectLocationJobTriggerListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32145,13 +31423,15 @@ impl<'a, C> ProjectLocationJobTriggerListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32442,25 +31722,15 @@ impl<'a, C> ProjectLocationJobTriggerPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32468,13 +31738,15 @@ impl<'a, C> ProjectLocationJobTriggerPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32739,25 +32011,15 @@ impl<'a, C> ProjectLocationStoredInfoTypeCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32765,13 +32027,15 @@ impl<'a, C> ProjectLocationStoredInfoTypeCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33015,25 +32279,15 @@ impl<'a, C> ProjectLocationStoredInfoTypeDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33041,13 +32295,15 @@ impl<'a, C> ProjectLocationStoredInfoTypeDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33282,25 +32538,15 @@ impl<'a, C> ProjectLocationStoredInfoTypeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33308,13 +32554,15 @@ impl<'a, C> ProjectLocationStoredInfoTypeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33569,25 +32817,15 @@ impl<'a, C> ProjectLocationStoredInfoTypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33595,13 +32833,15 @@ impl<'a, C> ProjectLocationStoredInfoTypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33885,25 +33125,15 @@ impl<'a, C> ProjectLocationStoredInfoTypePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33911,13 +33141,15 @@ impl<'a, C> ProjectLocationStoredInfoTypePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34182,25 +33414,15 @@ impl<'a, C> ProjectStoredInfoTypeCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34208,13 +33430,15 @@ impl<'a, C> ProjectStoredInfoTypeCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34458,25 +33682,15 @@ impl<'a, C> ProjectStoredInfoTypeDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34484,13 +33698,15 @@ impl<'a, C> ProjectStoredInfoTypeDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34725,25 +33941,15 @@ impl<'a, C> ProjectStoredInfoTypeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34751,13 +33957,15 @@ impl<'a, C> ProjectStoredInfoTypeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35012,25 +34220,15 @@ impl<'a, C> ProjectStoredInfoTypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35038,13 +34236,15 @@ impl<'a, C> ProjectStoredInfoTypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35328,25 +34528,15 @@ impl<'a, C> ProjectStoredInfoTypePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35354,13 +34544,15 @@ impl<'a, C> ProjectStoredInfoTypePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/dlp2/src/client.rs b/gen/dlp2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/dlp2/src/client.rs +++ b/gen/dlp2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/dlp2_beta1-cli/src/main.rs b/gen/dlp2_beta1-cli/src/main.rs index 1d0dd7ce3b..ba971134e1 100644 --- a/gen/dlp2_beta1-cli/src/main.rs +++ b/gen/dlp2_beta1-cli/src/main.rs @@ -714,7 +714,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -776,7 +776,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1026,7 +1026,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/dlp2_beta1/src/api.rs b/gen/dlp2_beta1/src/api.rs index 875a355a79..9a85f52628 100644 --- a/gen/dlp2_beta1/src/api.rs +++ b/gen/dlp2_beta1/src/api.rs @@ -3003,25 +3003,15 @@ impl<'a, C> ContentDeidentifyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3029,13 +3019,15 @@ impl<'a, C> ContentDeidentifyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3266,25 +3258,15 @@ impl<'a, C> ContentInspectCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3292,13 +3274,15 @@ impl<'a, C> ContentInspectCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3529,25 +3513,15 @@ impl<'a, C> ContentRedactCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3555,13 +3529,15 @@ impl<'a, C> ContentRedactCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3802,25 +3778,15 @@ impl<'a, C> RootCategoryInfoTypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3828,13 +3794,15 @@ impl<'a, C> RootCategoryInfoTypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4058,25 +4026,15 @@ impl<'a, C> RootCategoryListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4084,13 +4042,15 @@ impl<'a, C> RootCategoryListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4347,25 +4307,15 @@ impl<'a, C> RiskAnalysiOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4373,13 +4323,15 @@ impl<'a, C> RiskAnalysiOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4625,25 +4577,15 @@ impl<'a, C> RiskAnalysiOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4651,13 +4593,15 @@ impl<'a, C> RiskAnalysiOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4909,25 +4853,15 @@ impl<'a, C> RiskAnalysiOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4935,13 +4869,15 @@ impl<'a, C> RiskAnalysiOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5201,25 +5137,15 @@ impl<'a, C> RiskAnalysiOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5227,13 +5153,15 @@ impl<'a, C> RiskAnalysiOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5465,25 +5393,15 @@ impl<'a, C> DataSourceAnalyzeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5491,13 +5409,15 @@ impl<'a, C> DataSourceAnalyzeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5728,25 +5648,15 @@ impl<'a, C> InspectOperationCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5754,13 +5664,15 @@ impl<'a, C> InspectOperationCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6017,25 +5929,15 @@ impl<'a, C> InspectOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6043,13 +5945,15 @@ impl<'a, C> InspectOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6295,25 +6199,15 @@ impl<'a, C> InspectOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6321,13 +6215,15 @@ impl<'a, C> InspectOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6579,25 +6475,15 @@ impl<'a, C> InspectOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6605,13 +6491,15 @@ impl<'a, C> InspectOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6871,25 +6759,15 @@ impl<'a, C> InspectOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6897,13 +6775,15 @@ impl<'a, C> InspectOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7155,25 +7035,15 @@ impl<'a, C> InspectResultFindingListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7181,13 +7051,15 @@ impl<'a, C> InspectResultFindingListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/dlp2_beta1/src/client.rs b/gen/dlp2_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/dlp2_beta1/src/client.rs +++ b/gen/dlp2_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/dns1-cli/src/main.rs b/gen/dns1-cli/src/main.rs index 08ea231d3d..a9129fd416 100644 --- a/gen/dns1-cli/src/main.rs +++ b/gen/dns1-cli/src/main.rs @@ -222,7 +222,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-by", "max-results", "page-token", "sort-order"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "sort-by", "sort-order"].iter().map(|v|*v)); v } )); } } @@ -281,7 +281,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["digest-type", "client-operation-id"].iter().map(|v|*v)); + v.extend(["client-operation-id", "digest-type"].iter().map(|v|*v)); v } )); } } @@ -343,7 +343,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "page-token", "digest-type"].iter().map(|v|*v)); + v.extend(["digest-type", "max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -461,7 +461,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-by", "max-results", "page-token"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "sort-by"].iter().map(|v|*v)); v } )); } } @@ -1832,7 +1832,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["name", "max-results", "page-token", "type"].iter().map(|v|*v)); + v.extend(["max-results", "name", "page-token", "type"].iter().map(|v|*v)); v } )); } } diff --git a/gen/dns1/src/api.rs b/gen/dns1/src/api.rs index 26fceeb5d4..c408c3854c 100644 --- a/gen/dns1/src/api.rs +++ b/gen/dns1/src/api.rs @@ -2064,25 +2064,15 @@ impl<'a, C> ChangeCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2090,13 +2080,15 @@ impl<'a, C> ChangeCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2362,25 +2354,15 @@ impl<'a, C> ChangeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2388,13 +2370,15 @@ impl<'a, C> ChangeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2674,25 +2658,15 @@ impl<'a, C> ChangeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2700,13 +2674,15 @@ impl<'a, C> ChangeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2989,25 +2965,15 @@ impl<'a, C> DnsKeyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3015,13 +2981,15 @@ impl<'a, C> DnsKeyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3303,25 +3271,15 @@ impl<'a, C> DnsKeyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3329,13 +3287,15 @@ impl<'a, C> DnsKeyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3606,25 +3566,15 @@ impl<'a, C> ManagedZoneOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3632,13 +3582,15 @@ impl<'a, C> ManagedZoneOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3913,25 +3865,15 @@ impl<'a, C> ManagedZoneOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3939,13 +3881,15 @@ impl<'a, C> ManagedZoneOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4233,25 +4177,15 @@ impl<'a, C> ManagedZoneCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4259,13 +4193,15 @@ impl<'a, C> ManagedZoneCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4518,25 +4454,15 @@ impl<'a, C> ManagedZoneDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4544,11 +4470,11 @@ impl<'a, C> ManagedZoneDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -4797,25 +4723,15 @@ impl<'a, C> ManagedZoneGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4823,13 +4739,15 @@ impl<'a, C> ManagedZoneGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5092,25 +5010,15 @@ impl<'a, C> ManagedZoneListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5118,13 +5026,15 @@ impl<'a, C> ManagedZoneListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5404,25 +5314,15 @@ impl<'a, C> ManagedZonePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5430,13 +5330,15 @@ impl<'a, C> ManagedZonePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5721,25 +5623,15 @@ impl<'a, C> ManagedZoneUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5747,13 +5639,15 @@ impl<'a, C> ManagedZoneUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6036,25 +5930,15 @@ impl<'a, C> PolicyCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6062,13 +5946,15 @@ impl<'a, C> PolicyCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6321,25 +6207,15 @@ impl<'a, C> PolicyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6347,11 +6223,11 @@ impl<'a, C> PolicyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -6600,25 +6476,15 @@ impl<'a, C> PolicyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6626,13 +6492,15 @@ impl<'a, C> PolicyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6890,25 +6758,15 @@ impl<'a, C> PolicyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6916,13 +6774,15 @@ impl<'a, C> PolicyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7195,25 +7055,15 @@ impl<'a, C> PolicyPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7221,13 +7071,15 @@ impl<'a, C> PolicyPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7512,25 +7364,15 @@ impl<'a, C> PolicyUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7538,13 +7380,15 @@ impl<'a, C> PolicyUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7829,25 +7673,15 @@ impl<'a, C> ProjectManagedZoneRrsetCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7855,13 +7689,15 @@ impl<'a, C> ProjectManagedZoneRrsetCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8129,25 +7965,15 @@ impl<'a, C> ProjectManagedZoneRrsetDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8155,13 +7981,15 @@ impl<'a, C> ProjectManagedZoneRrsetDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8440,25 +8268,15 @@ impl<'a, C> ProjectManagedZoneRrsetGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8466,13 +8284,15 @@ impl<'a, C> ProjectManagedZoneRrsetGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8772,25 +8592,15 @@ impl<'a, C> ProjectManagedZoneRrsetPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8798,13 +8608,15 @@ impl<'a, C> ProjectManagedZoneRrsetPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9086,25 +8898,15 @@ impl<'a, C> ProjectGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9112,13 +8914,15 @@ impl<'a, C> ProjectGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9378,25 +9182,15 @@ impl<'a, C> ResourceRecordSetListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9404,13 +9198,15 @@ impl<'a, C> ResourceRecordSetListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/dns1/src/client.rs b/gen/dns1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/dns1/src/client.rs +++ b/gen/dns1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/docs1/src/api.rs b/gen/docs1/src/api.rs index 940a1ae7d5..b421ab06f2 100644 --- a/gen/docs1/src/api.rs +++ b/gen/docs1/src/api.rs @@ -3720,25 +3720,15 @@ impl<'a, C> DocumentBatchUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3746,13 +3736,15 @@ impl<'a, C> DocumentBatchUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3990,25 +3982,15 @@ impl<'a, C> DocumentCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4016,13 +3998,15 @@ impl<'a, C> DocumentCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4257,25 +4241,15 @@ impl<'a, C> DocumentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4283,13 +4257,15 @@ impl<'a, C> DocumentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/docs1/src/client.rs b/gen/docs1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/docs1/src/client.rs +++ b/gen/docs1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/documentai1-cli/src/main.rs b/gen/documentai1-cli/src/main.rs index b77aa14136..a6d2ac1287 100644 --- a/gen/documentai1-cli/src/main.rs +++ b/gen/documentai1-cli/src/main.rs @@ -206,7 +206,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -320,7 +320,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -997,7 +997,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/documentai1/src/api.rs b/gen/documentai1/src/api.rs index c084966089..97041a4282 100644 --- a/gen/documentai1/src/api.rs +++ b/gen/documentai1/src/api.rs @@ -1985,25 +1985,15 @@ impl<'a, C> OperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2011,13 +2001,15 @@ impl<'a, C> OperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2261,25 +2253,15 @@ impl<'a, C> OperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2287,13 +2269,15 @@ impl<'a, C> OperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2543,25 +2527,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2569,13 +2543,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2831,25 +2807,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2857,13 +2823,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3119,25 +3087,15 @@ impl<'a, C> ProjectLocationProcessorHumanReviewConfigReviewDocumentCall<'a, C> w return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3145,13 +3103,15 @@ impl<'a, C> ProjectLocationProcessorHumanReviewConfigReviewDocumentCall<'a, C> w } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3416,25 +3376,15 @@ impl<'a, C> ProjectLocationProcessorProcessorVersionBatchProcesCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3442,13 +3392,15 @@ impl<'a, C> ProjectLocationProcessorProcessorVersionBatchProcesCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3713,25 +3665,15 @@ impl<'a, C> ProjectLocationProcessorProcessorVersionProcesCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3739,13 +3681,15 @@ impl<'a, C> ProjectLocationProcessorProcessorVersionProcesCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4010,25 +3954,15 @@ impl<'a, C> ProjectLocationProcessorBatchProcesCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4036,13 +3970,15 @@ impl<'a, C> ProjectLocationProcessorBatchProcesCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4307,25 +4243,15 @@ impl<'a, C> ProjectLocationProcessorProcesCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4333,13 +4259,15 @@ impl<'a, C> ProjectLocationProcessorProcesCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4583,25 +4511,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4609,13 +4527,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4865,25 +4785,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4891,13 +4801,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5153,25 +5065,15 @@ impl<'a, C> ProjectOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5179,13 +5081,15 @@ impl<'a, C> ProjectOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5420,25 +5324,15 @@ impl<'a, C> Uiv1beta3ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5446,13 +5340,15 @@ impl<'a, C> Uiv1beta3ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5687,25 +5583,15 @@ impl<'a, C> Uiv1beta3ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5713,13 +5599,15 @@ impl<'a, C> Uiv1beta3ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5969,25 +5857,15 @@ impl<'a, C> Uiv1beta3ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5995,13 +5873,15 @@ impl<'a, C> Uiv1beta3ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/documentai1/src/client.rs b/gen/documentai1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/documentai1/src/client.rs +++ b/gen/documentai1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/documentai1_beta2/src/api.rs b/gen/documentai1_beta2/src/api.rs index 9a5a671356..d32f232a6e 100644 --- a/gen/documentai1_beta2/src/api.rs +++ b/gen/documentai1_beta2/src/api.rs @@ -1672,25 +1672,15 @@ impl<'a, C> ProjectDocumentBatchProcesCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1698,13 +1688,15 @@ impl<'a, C> ProjectDocumentBatchProcesCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1969,25 +1961,15 @@ impl<'a, C> ProjectDocumentProcesCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1995,13 +1977,15 @@ impl<'a, C> ProjectDocumentProcesCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2266,25 +2250,15 @@ impl<'a, C> ProjectLocationDocumentBatchProcesCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2292,13 +2266,15 @@ impl<'a, C> ProjectLocationDocumentBatchProcesCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2563,25 +2539,15 @@ impl<'a, C> ProjectLocationDocumentProcesCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2589,13 +2555,15 @@ impl<'a, C> ProjectLocationDocumentProcesCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2839,25 +2807,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2865,13 +2823,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3106,25 +3066,15 @@ impl<'a, C> ProjectOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3132,13 +3082,15 @@ impl<'a, C> ProjectOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/documentai1_beta2/src/client.rs b/gen/documentai1_beta2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/documentai1_beta2/src/client.rs +++ b/gen/documentai1_beta2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/domains1_beta1-cli/src/main.rs b/gen/domains1_beta1-cli/src/main.rs index 88c09f8edc..536999b228 100644 --- a/gen/domains1_beta1-cli/src/main.rs +++ b/gen/domains1_beta1-cli/src/main.rs @@ -122,7 +122,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "page-token", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -236,7 +236,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "page-token", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -848,7 +848,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "page-token", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/domains1_beta1/src/api.rs b/gen/domains1_beta1/src/api.rs index 648e97c992..d58f3f18ac 100644 --- a/gen/domains1_beta1/src/api.rs +++ b/gen/domains1_beta1/src/api.rs @@ -1509,25 +1509,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1535,13 +1525,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1791,25 +1783,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1817,13 +1799,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2100,25 +2084,15 @@ impl<'a, C> ProjectLocationRegistrationConfigureContactSettingCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2126,13 +2100,15 @@ impl<'a, C> ProjectLocationRegistrationConfigureContactSettingCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2397,25 +2373,15 @@ impl<'a, C> ProjectLocationRegistrationConfigureDnsSettingCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2423,13 +2389,15 @@ impl<'a, C> ProjectLocationRegistrationConfigureDnsSettingCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2694,25 +2662,15 @@ impl<'a, C> ProjectLocationRegistrationConfigureManagementSettingCall<'a, C> whe return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2720,13 +2678,15 @@ impl<'a, C> ProjectLocationRegistrationConfigureManagementSettingCall<'a, C> whe } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2970,25 +2930,15 @@ impl<'a, C> ProjectLocationRegistrationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2996,13 +2946,15 @@ impl<'a, C> ProjectLocationRegistrationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3258,25 +3210,15 @@ impl<'a, C> ProjectLocationRegistrationExportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3284,13 +3226,15 @@ impl<'a, C> ProjectLocationRegistrationExportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3534,25 +3478,15 @@ impl<'a, C> ProjectLocationRegistrationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3560,13 +3494,15 @@ impl<'a, C> ProjectLocationRegistrationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3806,25 +3742,15 @@ impl<'a, C> ProjectLocationRegistrationGetIamPolicyCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3832,13 +3758,15 @@ impl<'a, C> ProjectLocationRegistrationGetIamPolicyCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4095,25 +4023,15 @@ impl<'a, C> ProjectLocationRegistrationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4121,13 +4039,15 @@ impl<'a, C> ProjectLocationRegistrationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4409,25 +4329,15 @@ impl<'a, C> ProjectLocationRegistrationPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4435,13 +4345,15 @@ impl<'a, C> ProjectLocationRegistrationPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4713,25 +4625,15 @@ impl<'a, C> ProjectLocationRegistrationRegisterCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4739,13 +4641,15 @@ impl<'a, C> ProjectLocationRegistrationRegisterCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5010,25 +4914,15 @@ impl<'a, C> ProjectLocationRegistrationResetAuthorizationCodeCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5036,13 +4930,15 @@ impl<'a, C> ProjectLocationRegistrationResetAuthorizationCodeCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5286,25 +5182,15 @@ impl<'a, C> ProjectLocationRegistrationRetrieveAuthorizationCodeCall<'a, C> wher return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5312,13 +5198,15 @@ impl<'a, C> ProjectLocationRegistrationRetrieveAuthorizationCodeCall<'a, C> wher } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5558,25 +5446,15 @@ impl<'a, C> ProjectLocationRegistrationRetrieveRegisterParameterCall<'a, C> wher return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5584,13 +5462,15 @@ impl<'a, C> ProjectLocationRegistrationRetrieveRegisterParameterCall<'a, C> wher } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5837,25 +5717,15 @@ impl<'a, C> ProjectLocationRegistrationSearchDomainCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5863,13 +5733,15 @@ impl<'a, C> ProjectLocationRegistrationSearchDomainCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6132,25 +6004,15 @@ impl<'a, C> ProjectLocationRegistrationSetIamPolicyCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6158,13 +6020,15 @@ impl<'a, C> ProjectLocationRegistrationSetIamPolicyCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6429,25 +6293,15 @@ impl<'a, C> ProjectLocationRegistrationTestIamPermissionCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6455,13 +6309,15 @@ impl<'a, C> ProjectLocationRegistrationTestIamPermissionCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6705,25 +6561,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6731,13 +6577,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6987,25 +6835,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7013,13 +6851,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/domains1_beta1/src/client.rs b/gen/domains1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/domains1_beta1/src/client.rs +++ b/gen/domains1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/domainsrdap1/src/api.rs b/gen/domainsrdap1/src/api.rs index 42d5ff4f74..ac88632de2 100644 --- a/gen/domainsrdap1/src/api.rs +++ b/gen/domainsrdap1/src/api.rs @@ -798,25 +798,15 @@ impl<'a, C> AutnumGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -824,13 +814,15 @@ impl<'a, C> AutnumGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1033,25 +1025,15 @@ impl<'a, C> DomainGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1059,13 +1041,15 @@ impl<'a, C> DomainGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1265,25 +1249,15 @@ impl<'a, C> EntityGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1291,13 +1265,15 @@ impl<'a, C> EntityGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1498,25 +1474,15 @@ impl<'a, C> IpGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1524,13 +1490,15 @@ impl<'a, C> IpGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1738,25 +1706,15 @@ impl<'a, C> NameserverGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1764,13 +1722,15 @@ impl<'a, C> NameserverGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1946,25 +1906,15 @@ impl<'a, C> MethodGetDomainCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1972,13 +1922,15 @@ impl<'a, C> MethodGetDomainCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2145,25 +2097,15 @@ impl<'a, C> MethodGetEntityCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2171,13 +2113,15 @@ impl<'a, C> MethodGetEntityCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2344,25 +2288,15 @@ impl<'a, C> MethodGetHelpCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2370,13 +2304,15 @@ impl<'a, C> MethodGetHelpCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2543,25 +2479,15 @@ impl<'a, C> MethodGetIpCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2569,13 +2495,15 @@ impl<'a, C> MethodGetIpCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2742,25 +2670,15 @@ impl<'a, C> MethodGetNameserverCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2768,13 +2686,15 @@ impl<'a, C> MethodGetNameserverCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/domainsrdap1/src/client.rs b/gen/domainsrdap1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/domainsrdap1/src/client.rs +++ b/gen/domainsrdap1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/doubleclickbidmanager1/src/api.rs b/gen/doubleclickbidmanager1/src/api.rs index 3e4e2ed892..096ca48b1f 100644 --- a/gen/doubleclickbidmanager1/src/api.rs +++ b/gen/doubleclickbidmanager1/src/api.rs @@ -1136,25 +1136,15 @@ impl<'a, C> LineitemDownloadlineitemCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1162,13 +1152,15 @@ impl<'a, C> LineitemDownloadlineitemCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1396,25 +1388,15 @@ impl<'a, C> LineitemUploadlineitemCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1422,13 +1404,15 @@ impl<'a, C> LineitemUploadlineitemCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1656,25 +1640,15 @@ impl<'a, C> QueryCreatequeryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1682,13 +1656,15 @@ impl<'a, C> QueryCreatequeryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1917,25 +1893,15 @@ impl<'a, C> QueryDeletequeryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1943,11 +1909,11 @@ impl<'a, C> QueryDeletequeryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -2172,25 +2138,15 @@ impl<'a, C> QueryGetqueryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2198,13 +2154,15 @@ impl<'a, C> QueryGetqueryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2412,25 +2370,15 @@ impl<'a, C> QueryListqueryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2438,13 +2386,15 @@ impl<'a, C> QueryListqueryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2685,25 +2635,15 @@ impl<'a, C> QueryRunqueryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2711,11 +2651,11 @@ impl<'a, C> QueryRunqueryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -2949,25 +2889,15 @@ impl<'a, C> ReportListreportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2975,13 +2905,15 @@ impl<'a, C> ReportListreportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3210,25 +3142,15 @@ impl<'a, C> SdfDownloadCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3236,13 +3158,15 @@ impl<'a, C> SdfDownloadCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/doubleclickbidmanager1/src/client.rs b/gen/doubleclickbidmanager1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/doubleclickbidmanager1/src/client.rs +++ b/gen/doubleclickbidmanager1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/doubleclickbidmanager1d1-cli/src/main.rs b/gen/doubleclickbidmanager1d1-cli/src/main.rs index a693d6699d..7f2ff6e28d 100644 --- a/gen/doubleclickbidmanager1d1-cli/src/main.rs +++ b/gen/doubleclickbidmanager1d1-cli/src/main.rs @@ -454,7 +454,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -597,7 +597,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/doubleclickbidmanager1d1/src/api.rs b/gen/doubleclickbidmanager1d1/src/api.rs index 7b5e7930fe..2311451fb4 100644 --- a/gen/doubleclickbidmanager1d1/src/api.rs +++ b/gen/doubleclickbidmanager1d1/src/api.rs @@ -1285,25 +1285,15 @@ impl<'a, C> LineitemDownloadlineitemCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1311,13 +1301,15 @@ impl<'a, C> LineitemDownloadlineitemCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1545,25 +1537,15 @@ impl<'a, C> LineitemUploadlineitemCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1571,13 +1553,15 @@ impl<'a, C> LineitemUploadlineitemCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1810,25 +1794,15 @@ impl<'a, C> QueryCreatequeryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1836,13 +1810,15 @@ impl<'a, C> QueryCreatequeryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2078,25 +2054,15 @@ impl<'a, C> QueryDeletequeryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2104,11 +2070,11 @@ impl<'a, C> QueryDeletequeryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -2333,25 +2299,15 @@ impl<'a, C> QueryGetqueryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2359,13 +2315,15 @@ impl<'a, C> QueryGetqueryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2583,25 +2541,15 @@ impl<'a, C> QueryListqueryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2609,13 +2557,15 @@ impl<'a, C> QueryListqueryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2875,25 +2825,15 @@ impl<'a, C> QueryRunqueryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2901,11 +2841,11 @@ impl<'a, C> QueryRunqueryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -3156,25 +3096,15 @@ impl<'a, C> ReportListreportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3182,13 +3112,15 @@ impl<'a, C> ReportListreportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3431,25 +3363,15 @@ impl<'a, C> SdfDownloadCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3457,13 +3379,15 @@ impl<'a, C> SdfDownloadCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/doubleclickbidmanager1d1/src/client.rs b/gen/doubleclickbidmanager1d1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/doubleclickbidmanager1d1/src/client.rs +++ b/gen/doubleclickbidmanager1d1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/doubleclicksearch2-cli/src/main.rs b/gen/doubleclicksearch2-cli/src/main.rs index fc063cb40d..4f907e156a 100644 --- a/gen/doubleclicksearch2-cli/src/main.rs +++ b/gen/doubleclicksearch2-cli/src/main.rs @@ -77,7 +77,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["ad-id", "ad-group-id", "campaign-id", "criterion-id"].iter().map(|v|*v)); + v.extend(["ad-group-id", "ad-id", "campaign-id", "criterion-id"].iter().map(|v|*v)); v } )); } } diff --git a/gen/doubleclicksearch2/src/api.rs b/gen/doubleclicksearch2/src/api.rs index 9eed9ee638..49117ab56e 100644 --- a/gen/doubleclicksearch2/src/api.rs +++ b/gen/doubleclicksearch2/src/api.rs @@ -1177,25 +1177,15 @@ impl<'a, C> ConversionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1203,13 +1193,15 @@ impl<'a, C> ConversionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1526,25 +1518,15 @@ impl<'a, C> ConversionInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1552,13 +1534,15 @@ impl<'a, C> ConversionInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1786,25 +1770,15 @@ impl<'a, C> ConversionUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1812,13 +1786,15 @@ impl<'a, C> ConversionUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2046,25 +2022,15 @@ impl<'a, C> ConversionUpdateAvailabilityCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2072,13 +2038,15 @@ impl<'a, C> ConversionUpdateAvailabilityCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2306,25 +2274,15 @@ impl<'a, C> ReportGenerateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2332,13 +2290,15 @@ impl<'a, C> ReportGenerateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2568,25 +2528,15 @@ impl<'a, C> ReportGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2594,13 +2544,15 @@ impl<'a, C> ReportGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2835,25 +2787,15 @@ impl<'a, C> ReportGetFileCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2861,11 +2803,11 @@ impl<'a, C> ReportGetFileCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -3098,25 +3040,15 @@ impl<'a, C> ReportRequestCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3124,13 +3056,15 @@ impl<'a, C> ReportRequestCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3362,25 +3296,15 @@ impl<'a, C> SavedColumnListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3388,13 +3312,15 @@ impl<'a, C> SavedColumnListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/doubleclicksearch2/src/client.rs b/gen/doubleclicksearch2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/doubleclicksearch2/src/client.rs +++ b/gen/doubleclicksearch2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/drive2-cli/src/main.rs b/gen/drive2-cli/src/main.rs index 9e42438ecb..170bf2016b 100644 --- a/gen/drive2-cli/src/main.rs +++ b/gen/drive2-cli/src/main.rs @@ -70,7 +70,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-change-id", "include-subscribed", "max-change-id-count"].iter().map(|v|*v)); + v.extend(["include-subscribed", "max-change-id-count", "start-change-id"].iter().map(|v|*v)); v } )); } } @@ -249,7 +249,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["team-drive-id", "supports-all-drives", "drive-id", "supports-team-drives"].iter().map(|v|*v)); + v.extend(["drive-id", "supports-all-drives", "supports-team-drives", "team-drive-id"].iter().map(|v|*v)); v } )); } } @@ -314,7 +314,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["team-drive-id", "supports-all-drives", "drive-id", "supports-team-drives"].iter().map(|v|*v)); + v.extend(["drive-id", "supports-all-drives", "supports-team-drives", "team-drive-id"].iter().map(|v|*v)); v } )); } } @@ -409,7 +409,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["include-team-drive-items", "include-items-from-all-drives", "max-results", "drive-id", "include-corpus-removals", "include-deleted", "spaces", "start-change-id", "supports-all-drives", "page-token", "include-subscribed", "team-drive-id", "include-permissions-for-view", "supports-team-drives"].iter().map(|v|*v)); + v.extend(["drive-id", "include-corpus-removals", "include-deleted", "include-items-from-all-drives", "include-permissions-for-view", "include-subscribed", "include-team-drive-items", "max-results", "page-token", "spaces", "start-change-id", "supports-all-drives", "supports-team-drives", "team-drive-id"].iter().map(|v|*v)); v } )); } } @@ -546,7 +546,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["include-team-drive-items", "include-items-from-all-drives", "max-results", "drive-id", "include-corpus-removals", "include-deleted", "spaces", "start-change-id", "supports-all-drives", "page-token", "include-subscribed", "team-drive-id", "include-permissions-for-view", "supports-team-drives"].iter().map(|v|*v)); + v.extend(["drive-id", "include-corpus-removals", "include-deleted", "include-items-from-all-drives", "include-permissions-for-view", "include-subscribed", "include-team-drive-items", "max-results", "page-token", "spaces", "start-change-id", "supports-all-drives", "supports-team-drives", "team-drive-id"].iter().map(|v|*v)); v } )); } } @@ -830,7 +830,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["supports-all-drives", "enforce-single-parent", "supports-team-drives"].iter().map(|v|*v)); + v.extend(["enforce-single-parent", "supports-all-drives", "supports-team-drives"].iter().map(|v|*v)); v } )); } } @@ -895,7 +895,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "q", "page-token", "order-by"].iter().map(|v|*v)); + v.extend(["max-results", "order-by", "page-token", "q"].iter().map(|v|*v)); v } )); } } @@ -1164,7 +1164,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["updated-min", "include-deleted", "max-results", "page-token"].iter().map(|v|*v)); + v.extend(["include-deleted", "max-results", "page-token", "updated-min"].iter().map(|v|*v)); v } )); } } @@ -1707,7 +1707,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "q", "page-token", "use-domain-admin-access"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "q", "use-domain-admin-access"].iter().map(|v|*v)); v } )); } } @@ -2159,7 +2159,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["pinned", "ocr", "convert", "enforce-single-parent", "timed-text-track-name", "timed-text-language", "supports-all-drives", "ocr-language", "visibility", "include-permissions-for-view", "supports-team-drives"].iter().map(|v|*v)); + v.extend(["convert", "enforce-single-parent", "include-permissions-for-view", "ocr", "ocr-language", "pinned", "supports-all-drives", "supports-team-drives", "timed-text-language", "timed-text-track-name", "visibility"].iter().map(|v|*v)); v } )); } } @@ -2221,7 +2221,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["supports-all-drives", "enforce-single-parent", "supports-team-drives"].iter().map(|v|*v)); + v.extend(["enforce-single-parent", "supports-all-drives", "supports-team-drives"].iter().map(|v|*v)); v } )); } } @@ -2456,7 +2456,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["acknowledge-abuse", "supports-all-drives", "supports-team-drives", "update-viewed-date", "include-permissions-for-view", "revision-id", "projection"].iter().map(|v|*v)); + v.extend(["acknowledge-abuse", "include-permissions-for-view", "projection", "revision-id", "supports-all-drives", "supports-team-drives", "update-viewed-date"].iter().map(|v|*v)); v } )); } } @@ -2743,7 +2743,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["pinned", "use-content-as-indexable-text", "ocr", "convert", "enforce-single-parent", "timed-text-track-name", "timed-text-language", "supports-all-drives", "ocr-language", "visibility", "include-permissions-for-view", "supports-team-drives"].iter().map(|v|*v)); + v.extend(["convert", "enforce-single-parent", "include-permissions-for-view", "ocr", "ocr-language", "pinned", "supports-all-drives", "supports-team-drives", "timed-text-language", "timed-text-track-name", "use-content-as-indexable-text", "visibility"].iter().map(|v|*v)); v } )); } } @@ -2844,7 +2844,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["include-team-drive-items", "include-items-from-all-drives", "max-results", "drive-id", "projection", "order-by", "corpora", "spaces", "supports-all-drives", "corpus", "q", "page-token", "team-drive-id", "include-permissions-for-view", "supports-team-drives"].iter().map(|v|*v)); + v.extend(["corpora", "corpus", "drive-id", "include-items-from-all-drives", "include-permissions-for-view", "include-team-drive-items", "max-results", "order-by", "page-token", "projection", "q", "spaces", "supports-all-drives", "supports-team-drives", "team-drive-id"].iter().map(|v|*v)); v } )); } } @@ -3140,7 +3140,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["new-revision", "pinned", "use-content-as-indexable-text", "ocr", "remove-parents", "enforce-single-parent", "convert", "timed-text-track-name", "timed-text-language", "supports-all-drives", "add-parents", "ocr-language", "modified-date-behavior", "update-viewed-date", "include-permissions-for-view", "set-modified-date", "supports-team-drives"].iter().map(|v|*v)); + v.extend(["add-parents", "convert", "enforce-single-parent", "include-permissions-for-view", "modified-date-behavior", "new-revision", "ocr", "ocr-language", "pinned", "remove-parents", "set-modified-date", "supports-all-drives", "supports-team-drives", "timed-text-language", "timed-text-track-name", "update-viewed-date", "use-content-as-indexable-text"].iter().map(|v|*v)); v } )); } } @@ -3202,7 +3202,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["supports-all-drives", "include-permissions-for-view", "supports-team-drives"].iter().map(|v|*v)); + v.extend(["include-permissions-for-view", "supports-all-drives", "supports-team-drives"].iter().map(|v|*v)); v } )); } } @@ -3264,7 +3264,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["supports-all-drives", "include-permissions-for-view", "supports-team-drives"].iter().map(|v|*v)); + v.extend(["include-permissions-for-view", "supports-all-drives", "supports-team-drives"].iter().map(|v|*v)); v } )); } } @@ -3326,7 +3326,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["supports-all-drives", "include-permissions-for-view", "supports-team-drives"].iter().map(|v|*v)); + v.extend(["include-permissions-for-view", "supports-all-drives", "supports-team-drives"].iter().map(|v|*v)); v } )); } } @@ -3622,7 +3622,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["new-revision", "pinned", "use-content-as-indexable-text", "ocr", "remove-parents", "enforce-single-parent", "convert", "timed-text-track-name", "timed-text-language", "supports-all-drives", "add-parents", "ocr-language", "modified-date-behavior", "update-viewed-date", "include-permissions-for-view", "set-modified-date", "supports-team-drives"].iter().map(|v|*v)); + v.extend(["add-parents", "convert", "enforce-single-parent", "include-permissions-for-view", "modified-date-behavior", "new-revision", "ocr", "ocr-language", "pinned", "remove-parents", "set-modified-date", "supports-all-drives", "supports-team-drives", "timed-text-language", "timed-text-track-name", "update-viewed-date", "use-content-as-indexable-text"].iter().map(|v|*v)); v } )); } } @@ -3745,7 +3745,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["acknowledge-abuse", "supports-all-drives", "supports-team-drives", "update-viewed-date", "include-permissions-for-view", "revision-id", "projection"].iter().map(|v|*v)); + v.extend(["acknowledge-abuse", "include-permissions-for-view", "projection", "revision-id", "supports-all-drives", "supports-team-drives", "update-viewed-date"].iter().map(|v|*v)); v } )); } } @@ -3950,7 +3950,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["supports-all-drives", "enforce-single-parent", "supports-team-drives"].iter().map(|v|*v)); + v.extend(["enforce-single-parent", "supports-all-drives", "supports-team-drives"].iter().map(|v|*v)); v } )); } } @@ -4293,7 +4293,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["enforce-single-parent", "supports-all-drives", "move-to-new-owners-root", "send-notification-emails", "use-domain-admin-access", "email-message", "supports-team-drives"].iter().map(|v|*v)); + v.extend(["email-message", "enforce-single-parent", "move-to-new-owners-root", "send-notification-emails", "supports-all-drives", "supports-team-drives", "use-domain-admin-access"].iter().map(|v|*v)); v } )); } } @@ -4364,7 +4364,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "supports-all-drives", "page-token", "use-domain-admin-access", "include-permissions-for-view", "supports-team-drives"].iter().map(|v|*v)); + v.extend(["include-permissions-for-view", "max-results", "page-token", "supports-all-drives", "supports-team-drives", "use-domain-admin-access"].iter().map(|v|*v)); v } )); } } @@ -4481,7 +4481,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["remove-expiration", "transfer-ownership", "supports-all-drives", "use-domain-admin-access", "supports-team-drives"].iter().map(|v|*v)); + v.extend(["remove-expiration", "supports-all-drives", "supports-team-drives", "transfer-ownership", "use-domain-admin-access"].iter().map(|v|*v)); v } )); } } @@ -4598,7 +4598,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["remove-expiration", "transfer-ownership", "supports-all-drives", "use-domain-admin-access", "supports-team-drives"].iter().map(|v|*v)); + v.extend(["remove-expiration", "supports-all-drives", "supports-team-drives", "transfer-ownership", "use-domain-admin-access"].iter().map(|v|*v)); v } )); } } @@ -6140,7 +6140,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "q", "page-token", "use-domain-admin-access"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "q", "use-domain-admin-access"].iter().map(|v|*v)); v } )); } } diff --git a/gen/drive2/src/api.rs b/gen/drive2/src/api.rs index 5687002648..a1830ac91d 100644 --- a/gen/drive2/src/api.rs +++ b/gen/drive2/src/api.rs @@ -4701,25 +4701,15 @@ impl<'a, C> AboutGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4727,13 +4717,15 @@ impl<'a, C> AboutGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4971,25 +4963,15 @@ impl<'a, C> AppGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4997,13 +4979,15 @@ impl<'a, C> AppGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5222,25 +5206,15 @@ impl<'a, C> AppListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5248,13 +5222,15 @@ impl<'a, C> AppListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5512,25 +5488,15 @@ impl<'a, C> ChangeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5538,13 +5504,15 @@ impl<'a, C> ChangeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5796,25 +5764,15 @@ impl<'a, C> ChangeGetStartPageTokenCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5822,13 +5780,15 @@ impl<'a, C> ChangeGetStartPageTokenCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6120,25 +6080,15 @@ impl<'a, C> ChangeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6146,13 +6096,15 @@ impl<'a, C> ChangeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6535,25 +6487,15 @@ impl<'a, C> ChangeWatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6561,13 +6503,15 @@ impl<'a, C> ChangeWatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6888,25 +6832,15 @@ impl<'a, C> ChannelStopCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6914,11 +6848,11 @@ impl<'a, C> ChannelStopCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -7144,25 +7078,15 @@ impl<'a, C> ChildrenDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7170,11 +7094,11 @@ impl<'a, C> ChildrenDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -7414,25 +7338,15 @@ impl<'a, C> ChildrenGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7440,13 +7354,15 @@ impl<'a, C> ChildrenGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7719,25 +7635,15 @@ impl<'a, C> ChildrenInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7745,13 +7651,15 @@ impl<'a, C> ChildrenInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8028,25 +7936,15 @@ impl<'a, C> ChildrenListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8054,13 +7952,15 @@ impl<'a, C> ChildrenListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8316,25 +8216,15 @@ impl<'a, C> CommentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8342,11 +8232,11 @@ impl<'a, C> CommentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -8584,25 +8474,15 @@ impl<'a, C> CommentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8610,13 +8490,15 @@ impl<'a, C> CommentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8881,25 +8763,15 @@ impl<'a, C> CommentInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8907,13 +8779,15 @@ impl<'a, C> CommentInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9169,25 +9043,15 @@ impl<'a, C> CommentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9195,13 +9059,15 @@ impl<'a, C> CommentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9479,25 +9345,15 @@ impl<'a, C> CommentPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9505,13 +9361,15 @@ impl<'a, C> CommentPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9780,25 +9638,15 @@ impl<'a, C> CommentUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9806,13 +9654,15 @@ impl<'a, C> CommentUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10057,25 +9907,15 @@ impl<'a, C> DriveDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10083,11 +9923,11 @@ impl<'a, C> DriveDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -10313,25 +10153,15 @@ impl<'a, C> DriveGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10339,13 +10169,15 @@ impl<'a, C> DriveGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10579,25 +10411,15 @@ impl<'a, C> DriveHideCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10605,13 +10427,15 @@ impl<'a, C> DriveHideCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10838,25 +10662,15 @@ impl<'a, C> DriveInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10864,13 +10678,15 @@ impl<'a, C> DriveInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11103,25 +10919,15 @@ impl<'a, C> DriveListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11129,13 +10935,15 @@ impl<'a, C> DriveListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11380,25 +11188,15 @@ impl<'a, C> DriveUnhideCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11406,13 +11204,15 @@ impl<'a, C> DriveUnhideCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11665,25 +11465,15 @@ impl<'a, C> DriveUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11691,13 +11481,15 @@ impl<'a, C> DriveUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12016,25 +11808,15 @@ impl<'a, C> FileCopyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12042,13 +11824,15 @@ impl<'a, C> FileCopyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12375,25 +12159,15 @@ impl<'a, C> FileDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12401,11 +12175,11 @@ impl<'a, C> FileDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -12628,25 +12402,15 @@ impl<'a, C> FileEmptyTrashCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12654,11 +12418,11 @@ impl<'a, C> FileEmptyTrashCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -12880,25 +12644,15 @@ impl<'a, C> FileExportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12906,11 +12660,11 @@ impl<'a, C> FileExportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -13128,25 +12882,15 @@ impl<'a, C> FileGenerateIdCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13154,13 +12898,15 @@ impl<'a, C> FileGenerateIdCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13447,25 +13193,15 @@ impl<'a, C> FileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13473,19 +13209,21 @@ impl<'a, C> FileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = if enable_resource_parsing { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); } } - } else { (reconstructed_result, Default::default()) }; + } else { (res, Default::default()) }; dlg.finished(true); return Ok(result_value) @@ -13858,25 +13596,15 @@ impl<'a, C> FileInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13884,7 +13612,7 @@ impl<'a, C> FileInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -13896,7 +13624,7 @@ impl<'a, C> FileInsertCall<'a, C> where C: BorrowMut FileInsertCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14323,25 +14053,15 @@ impl<'a, C> FileListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14349,13 +14069,15 @@ impl<'a, C> FileListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14783,25 +14505,15 @@ impl<'a, C> FilePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14809,13 +14521,15 @@ impl<'a, C> FilePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15185,25 +14899,15 @@ impl<'a, C> FileTouchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15211,13 +14915,15 @@ impl<'a, C> FileTouchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15480,25 +15186,15 @@ impl<'a, C> FileTrashCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15506,13 +15202,15 @@ impl<'a, C> FileTrashCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15775,25 +15473,15 @@ impl<'a, C> FileUntrashCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15801,13 +15489,15 @@ impl<'a, C> FileUntrashCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16161,25 +15851,15 @@ impl<'a, C> FileUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16187,13 +15867,15 @@ impl<'a, C> FileUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16414,25 +16096,15 @@ impl<'a, C> FileUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16440,7 +16112,7 @@ impl<'a, C> FileUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -16452,7 +16124,7 @@ impl<'a, C> FileUpdateCall<'a, C> where C: BorrowMut FileUpdateCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16949,25 +16623,15 @@ impl<'a, C> FileWatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16975,19 +16639,21 @@ impl<'a, C> FileWatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = if enable_resource_parsing { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); } } - } else { (reconstructed_result, Default::default()) }; + } else { (res, Default::default()) }; dlg.finished(true); return Ok(result_value) @@ -17272,25 +16938,15 @@ impl<'a, C> ParentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17298,11 +16954,11 @@ impl<'a, C> ParentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -17542,25 +17198,15 @@ impl<'a, C> ParentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17568,13 +17214,15 @@ impl<'a, C> ParentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17847,25 +17495,15 @@ impl<'a, C> ParentInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17873,13 +17511,15 @@ impl<'a, C> ParentInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18136,25 +17776,15 @@ impl<'a, C> ParentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18162,13 +17792,15 @@ impl<'a, C> ParentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18411,25 +18043,15 @@ impl<'a, C> PermissionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18437,11 +18059,11 @@ impl<'a, C> PermissionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -18710,25 +18332,15 @@ impl<'a, C> PermissionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18736,13 +18348,15 @@ impl<'a, C> PermissionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19000,25 +18614,15 @@ impl<'a, C> PermissionGetIdForEmailCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19026,13 +18630,15 @@ impl<'a, C> PermissionGetIdForEmailCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19315,25 +18921,15 @@ impl<'a, C> PermissionInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19341,13 +18937,15 @@ impl<'a, C> PermissionInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19662,25 +19260,15 @@ impl<'a, C> PermissionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19688,13 +19276,15 @@ impl<'a, C> PermissionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20011,25 +19601,15 @@ impl<'a, C> PermissionPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20037,13 +19617,15 @@ impl<'a, C> PermissionPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20372,25 +19954,15 @@ impl<'a, C> PermissionUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20398,13 +19970,15 @@ impl<'a, C> PermissionUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20691,25 +20265,15 @@ impl<'a, C> PropertyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20717,11 +20281,11 @@ impl<'a, C> PropertyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -20966,25 +20530,15 @@ impl<'a, C> PropertyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20992,13 +20546,15 @@ impl<'a, C> PropertyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21263,25 +20819,15 @@ impl<'a, C> PropertyInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21289,13 +20835,15 @@ impl<'a, C> PropertyInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21531,25 +21079,15 @@ impl<'a, C> PropertyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21557,13 +21095,15 @@ impl<'a, C> PropertyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21818,25 +21358,15 @@ impl<'a, C> PropertyPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21844,13 +21374,15 @@ impl<'a, C> PropertyPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22131,25 +21663,15 @@ impl<'a, C> PropertyUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22157,13 +21679,15 @@ impl<'a, C> PropertyUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22419,25 +21943,15 @@ impl<'a, C> ReplyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22445,11 +21959,11 @@ impl<'a, C> ReplyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -22699,25 +22213,15 @@ impl<'a, C> ReplyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22725,13 +22229,15 @@ impl<'a, C> ReplyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23008,25 +22514,15 @@ impl<'a, C> ReplyInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23034,13 +22530,15 @@ impl<'a, C> ReplyInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23303,25 +22801,15 @@ impl<'a, C> ReplyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23329,13 +22817,15 @@ impl<'a, C> ReplyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23618,25 +23108,15 @@ impl<'a, C> ReplyPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23644,13 +23124,15 @@ impl<'a, C> ReplyPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23931,25 +23413,15 @@ impl<'a, C> ReplyUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23957,13 +23429,15 @@ impl<'a, C> ReplyUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24220,25 +23694,15 @@ impl<'a, C> RevisionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24246,11 +23710,11 @@ impl<'a, C> RevisionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -24483,25 +23947,15 @@ impl<'a, C> RevisionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24509,13 +23963,15 @@ impl<'a, C> RevisionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24762,25 +24218,15 @@ impl<'a, C> RevisionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24788,13 +24234,15 @@ impl<'a, C> RevisionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25058,25 +24506,15 @@ impl<'a, C> RevisionPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25084,13 +24522,15 @@ impl<'a, C> RevisionPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25359,25 +24799,15 @@ impl<'a, C> RevisionUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25385,13 +24815,15 @@ impl<'a, C> RevisionUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25636,25 +25068,15 @@ impl<'a, C> TeamdriveDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25662,11 +25084,11 @@ impl<'a, C> TeamdriveDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -25892,25 +25314,15 @@ impl<'a, C> TeamdriveGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25918,13 +25330,15 @@ impl<'a, C> TeamdriveGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26158,25 +25572,15 @@ impl<'a, C> TeamdriveInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26184,13 +25588,15 @@ impl<'a, C> TeamdriveInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26423,25 +25829,15 @@ impl<'a, C> TeamdriveListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26449,13 +25845,15 @@ impl<'a, C> TeamdriveListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26726,25 +26124,15 @@ impl<'a, C> TeamdriveUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26752,13 +26140,15 @@ impl<'a, C> TeamdriveUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/drive2/src/client.rs b/gen/drive2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/drive2/src/client.rs +++ b/gen/drive2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/drive3-cli/src/main.rs b/gen/drive3-cli/src/main.rs index 1550ed1210..e8debfa156 100644 --- a/gen/drive3-cli/src/main.rs +++ b/gen/drive3-cli/src/main.rs @@ -125,7 +125,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["drive-id", "supports-team-drives", "team-drive-id", "supports-all-drives"].iter().map(|v|*v)); + v.extend(["drive-id", "supports-all-drives", "supports-team-drives", "team-drive-id"].iter().map(|v|*v)); v } )); } } @@ -214,7 +214,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["spaces", "include-permissions-for-view", "include-corpus-removals", "page-size", "supports-team-drives", "drive-id", "restrict-to-my-drive", "include-team-drive-items", "include-removed", "include-items-from-all-drives", "supports-all-drives", "team-drive-id"].iter().map(|v|*v)); + v.extend(["drive-id", "include-corpus-removals", "include-items-from-all-drives", "include-permissions-for-view", "include-removed", "include-team-drive-items", "page-size", "restrict-to-my-drive", "spaces", "supports-all-drives", "supports-team-drives", "team-drive-id"].iter().map(|v|*v)); v } )); } } @@ -345,7 +345,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["spaces", "include-permissions-for-view", "include-corpus-removals", "page-size", "supports-team-drives", "drive-id", "restrict-to-my-drive", "include-team-drive-items", "include-removed", "include-items-from-all-drives", "supports-all-drives", "team-drive-id"].iter().map(|v|*v)); + v.extend(["drive-id", "include-corpus-removals", "include-items-from-all-drives", "include-permissions-for-view", "include-removed", "include-team-drive-items", "page-size", "restrict-to-my-drive", "spaces", "supports-all-drives", "supports-team-drives", "team-drive-id"].iter().map(|v|*v)); v } )); } } @@ -697,7 +697,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["include-deleted", "start-modified-time", "page-token", "page-size"].iter().map(|v|*v)); + v.extend(["include-deleted", "page-size", "page-token", "start-modified-time"].iter().map(|v|*v)); v } )); } } @@ -1133,7 +1133,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "q", "page-size", "use-domain-admin-access"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "q", "use-domain-admin-access"].iter().map(|v|*v)); v } )); } } @@ -1542,7 +1542,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["include-permissions-for-view", "keep-revision-forever", "supports-team-drives", "ignore-default-visibility", "supports-all-drives", "enforce-single-parent", "ocr-language"].iter().map(|v|*v)); + v.extend(["enforce-single-parent", "ignore-default-visibility", "include-permissions-for-view", "keep-revision-forever", "ocr-language", "supports-all-drives", "supports-team-drives"].iter().map(|v|*v)); v } )); } } @@ -1780,7 +1780,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["include-permissions-for-view", "use-content-as-indexable-text", "keep-revision-forever", "supports-team-drives", "ignore-default-visibility", "supports-all-drives", "enforce-single-parent", "ocr-language"].iter().map(|v|*v)); + v.extend(["enforce-single-parent", "ignore-default-visibility", "include-permissions-for-view", "keep-revision-forever", "ocr-language", "supports-all-drives", "supports-team-drives", "use-content-as-indexable-text"].iter().map(|v|*v)); v } )); } } @@ -1845,7 +1845,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["supports-team-drives", "supports-all-drives", "enforce-single-parent"].iter().map(|v|*v)); + v.extend(["enforce-single-parent", "supports-all-drives", "supports-team-drives"].iter().map(|v|*v)); v } )); } } @@ -2071,7 +2071,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["include-permissions-for-view", "supports-team-drives", "acknowledge-abuse", "supports-all-drives"].iter().map(|v|*v)); + v.extend(["acknowledge-abuse", "include-permissions-for-view", "supports-all-drives", "supports-team-drives"].iter().map(|v|*v)); v } )); } } @@ -2172,7 +2172,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["spaces", "include-permissions-for-view", "q", "order-by", "page-size", "supports-team-drives", "drive-id", "page-token", "corpus", "include-team-drive-items", "corpora", "include-items-from-all-drives", "supports-all-drives", "team-drive-id"].iter().map(|v|*v)); + v.extend(["corpora", "corpus", "drive-id", "include-items-from-all-drives", "include-permissions-for-view", "include-team-drive-items", "order-by", "page-size", "page-token", "q", "spaces", "supports-all-drives", "supports-team-drives", "team-drive-id"].iter().map(|v|*v)); v } )); } } @@ -2413,7 +2413,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["remove-parents", "include-permissions-for-view", "use-content-as-indexable-text", "add-parents", "keep-revision-forever", "supports-team-drives", "supports-all-drives", "enforce-single-parent", "ocr-language"].iter().map(|v|*v)); + v.extend(["add-parents", "enforce-single-parent", "include-permissions-for-view", "keep-revision-forever", "ocr-language", "remove-parents", "supports-all-drives", "supports-team-drives", "use-content-as-indexable-text"].iter().map(|v|*v)); v } )); } } @@ -2527,7 +2527,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["include-permissions-for-view", "supports-team-drives", "acknowledge-abuse", "supports-all-drives"].iter().map(|v|*v)); + v.extend(["acknowledge-abuse", "include-permissions-for-view", "supports-all-drives", "supports-team-drives"].iter().map(|v|*v)); v } )); } } @@ -2654,7 +2654,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["email-message", "move-to-new-owners-root", "transfer-ownership", "send-notification-email", "supports-team-drives", "use-domain-admin-access", "supports-all-drives", "enforce-single-parent"].iter().map(|v|*v)); + v.extend(["email-message", "enforce-single-parent", "move-to-new-owners-root", "send-notification-email", "supports-all-drives", "supports-team-drives", "transfer-ownership", "use-domain-admin-access"].iter().map(|v|*v)); v } )); } } @@ -2716,7 +2716,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["supports-team-drives", "supports-all-drives", "use-domain-admin-access"].iter().map(|v|*v)); + v.extend(["supports-all-drives", "supports-team-drives", "use-domain-admin-access"].iter().map(|v|*v)); v } )); } } @@ -2770,7 +2770,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["supports-team-drives", "supports-all-drives", "use-domain-admin-access"].iter().map(|v|*v)); + v.extend(["supports-all-drives", "supports-team-drives", "use-domain-admin-access"].iter().map(|v|*v)); v } )); } } @@ -2841,7 +2841,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["include-permissions-for-view", "page-size", "supports-team-drives", "page-token", "use-domain-admin-access", "supports-all-drives"].iter().map(|v|*v)); + v.extend(["include-permissions-for-view", "page-size", "page-token", "supports-all-drives", "supports-team-drives", "use-domain-admin-access"].iter().map(|v|*v)); v } )); } } @@ -2953,7 +2953,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["remove-expiration", "transfer-ownership", "supports-team-drives", "use-domain-admin-access", "supports-all-drives"].iter().map(|v|*v)); + v.extend(["remove-expiration", "supports-all-drives", "supports-team-drives", "transfer-ownership", "use-domain-admin-access"].iter().map(|v|*v)); v } )); } } @@ -3213,7 +3213,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["include-deleted", "page-token", "page-size"].iter().map(|v|*v)); + v.extend(["include-deleted", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3480,7 +3480,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3866,7 +3866,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "q", "page-size", "use-domain-admin-access"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "q", "use-domain-admin-access"].iter().map(|v|*v)); v } )); } } diff --git a/gen/drive3/src/api.rs b/gen/drive3/src/api.rs index fae31bce74..e00776da2a 100644 --- a/gen/drive3/src/api.rs +++ b/gen/drive3/src/api.rs @@ -3295,25 +3295,15 @@ impl<'a, C> AboutGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3321,13 +3311,15 @@ impl<'a, C> AboutGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3541,25 +3533,15 @@ impl<'a, C> ChangeGetStartPageTokenCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3567,13 +3549,15 @@ impl<'a, C> ChangeGetStartPageTokenCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3857,25 +3841,15 @@ impl<'a, C> ChangeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3883,13 +3857,15 @@ impl<'a, C> ChangeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4260,25 +4236,15 @@ impl<'a, C> ChangeWatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4286,13 +4252,15 @@ impl<'a, C> ChangeWatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4609,25 +4577,15 @@ impl<'a, C> ChannelStopCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4635,11 +4593,11 @@ impl<'a, C> ChannelStopCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -4880,25 +4838,15 @@ impl<'a, C> CommentCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4906,13 +4854,15 @@ impl<'a, C> CommentCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5149,25 +5099,15 @@ impl<'a, C> CommentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5175,11 +5115,11 @@ impl<'a, C> CommentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -5417,25 +5357,15 @@ impl<'a, C> CommentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5443,13 +5373,15 @@ impl<'a, C> CommentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5713,25 +5645,15 @@ impl<'a, C> CommentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5739,13 +5661,15 @@ impl<'a, C> CommentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6023,25 +5947,15 @@ impl<'a, C> CommentUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6049,13 +5963,15 @@ impl<'a, C> CommentUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6301,25 +6217,15 @@ impl<'a, C> DriveCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6327,13 +6233,15 @@ impl<'a, C> DriveCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6568,25 +6476,15 @@ impl<'a, C> DriveDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6594,11 +6492,11 @@ impl<'a, C> DriveDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -6824,25 +6722,15 @@ impl<'a, C> DriveGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6850,13 +6738,15 @@ impl<'a, C> DriveGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7090,25 +6980,15 @@ impl<'a, C> DriveHideCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7116,13 +6996,15 @@ impl<'a, C> DriveHideCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7346,25 +7228,15 @@ impl<'a, C> DriveListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7372,13 +7244,15 @@ impl<'a, C> DriveListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7623,25 +7497,15 @@ impl<'a, C> DriveUnhideCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7649,13 +7513,15 @@ impl<'a, C> DriveUnhideCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7908,25 +7774,15 @@ impl<'a, C> DriveUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7934,13 +7790,15 @@ impl<'a, C> DriveUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8239,25 +8097,15 @@ impl<'a, C> FileCopyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8265,13 +8113,15 @@ impl<'a, C> FileCopyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8639,25 +8489,15 @@ impl<'a, C> FileCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8665,7 +8505,7 @@ impl<'a, C> FileCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -8677,7 +8517,7 @@ impl<'a, C> FileCreateCall<'a, C> where C: BorrowMut FileCreateCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9038,25 +8880,15 @@ impl<'a, C> FileDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9064,11 +8896,11 @@ impl<'a, C> FileDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -9291,25 +9123,15 @@ impl<'a, C> FileEmptyTrashCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9317,11 +9139,11 @@ impl<'a, C> FileEmptyTrashCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -9543,25 +9365,15 @@ impl<'a, C> FileExportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9569,11 +9381,11 @@ impl<'a, C> FileExportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -9791,25 +9603,15 @@ impl<'a, C> FileGenerateIdCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9817,13 +9619,15 @@ impl<'a, C> FileGenerateIdCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10095,25 +9899,15 @@ impl<'a, C> FileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10121,19 +9915,21 @@ impl<'a, C> FileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = if enable_resource_parsing { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); } } - } else { (reconstructed_result, Default::default()) }; + } else { (res, Default::default()) }; dlg.finished(true); return Ok(result_value) @@ -10429,25 +10225,15 @@ impl<'a, C> FileListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10455,13 +10241,15 @@ impl<'a, C> FileListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10842,25 +10630,15 @@ impl<'a, C> FileUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10868,13 +10646,15 @@ impl<'a, C> FileUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11071,25 +10851,15 @@ impl<'a, C> FileUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11097,7 +10867,7 @@ impl<'a, C> FileUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -11109,7 +10879,7 @@ impl<'a, C> FileUpdateCall<'a, C> where C: BorrowMut FileUpdateCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11535,25 +11307,15 @@ impl<'a, C> FileWatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11561,19 +11323,21 @@ impl<'a, C> FileWatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = if enable_resource_parsing { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); } } - } else { (reconstructed_result, Default::default()) }; + } else { (res, Default::default()) }; dlg.finished(true); return Ok(result_value) @@ -11892,25 +11656,15 @@ impl<'a, C> PermissionCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11918,13 +11672,15 @@ impl<'a, C> PermissionCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12232,25 +11988,15 @@ impl<'a, C> PermissionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12258,11 +12004,11 @@ impl<'a, C> PermissionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -12531,25 +12277,15 @@ impl<'a, C> PermissionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12557,13 +12293,15 @@ impl<'a, C> PermissionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12851,25 +12589,15 @@ impl<'a, C> PermissionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12877,13 +12605,15 @@ impl<'a, C> PermissionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13200,25 +12930,15 @@ impl<'a, C> PermissionUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13226,13 +12946,15 @@ impl<'a, C> PermissionUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13536,25 +13258,15 @@ impl<'a, C> ReplyCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13562,13 +13274,15 @@ impl<'a, C> ReplyCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13817,25 +13531,15 @@ impl<'a, C> ReplyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13843,11 +13547,11 @@ impl<'a, C> ReplyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -14097,25 +13801,15 @@ impl<'a, C> ReplyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14123,13 +13817,15 @@ impl<'a, C> ReplyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14400,25 +14096,15 @@ impl<'a, C> ReplyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14426,13 +14112,15 @@ impl<'a, C> ReplyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14715,25 +14403,15 @@ impl<'a, C> ReplyUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14741,13 +14419,15 @@ impl<'a, C> ReplyUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15004,25 +14684,15 @@ impl<'a, C> RevisionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15030,11 +14700,11 @@ impl<'a, C> RevisionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -15293,25 +14963,15 @@ impl<'a, C> RevisionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15319,19 +14979,21 @@ impl<'a, C> RevisionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = if enable_resource_parsing { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); } } - } else { (reconstructed_result, Default::default()) }; + } else { (res, Default::default()) }; dlg.finished(true); return Ok(result_value) @@ -15579,25 +15241,15 @@ impl<'a, C> RevisionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15605,13 +15257,15 @@ impl<'a, C> RevisionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15875,25 +15529,15 @@ impl<'a, C> RevisionUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15901,13 +15545,15 @@ impl<'a, C> RevisionUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16153,25 +15799,15 @@ impl<'a, C> TeamdriveCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16179,13 +15815,15 @@ impl<'a, C> TeamdriveCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16420,25 +16058,15 @@ impl<'a, C> TeamdriveDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16446,11 +16074,11 @@ impl<'a, C> TeamdriveDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -16676,25 +16304,15 @@ impl<'a, C> TeamdriveGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16702,13 +16320,15 @@ impl<'a, C> TeamdriveGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16939,25 +16559,15 @@ impl<'a, C> TeamdriveListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16965,13 +16575,15 @@ impl<'a, C> TeamdriveListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17242,25 +16854,15 @@ impl<'a, C> TeamdriveUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17268,13 +16870,15 @@ impl<'a, C> TeamdriveUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/drive3/src/client.rs b/gen/drive3/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/drive3/src/client.rs +++ b/gen/drive3/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/driveactivity2/src/api.rs b/gen/driveactivity2/src/api.rs index 51acaeed18..2f74d014b5 100644 --- a/gen/driveactivity2/src/api.rs +++ b/gen/driveactivity2/src/api.rs @@ -1267,25 +1267,15 @@ impl<'a, C> ActivityQueryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1293,13 +1283,15 @@ impl<'a, C> ActivityQueryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/driveactivity2/src/client.rs b/gen/driveactivity2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/driveactivity2/src/client.rs +++ b/gen/driveactivity2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/eventarc1-cli/src/main.rs b/gen/eventarc1-cli/src/main.rs index 2c647a9268..8da82d47b2 100644 --- a/gen/eventarc1-cli/src/main.rs +++ b/gen/eventarc1-cli/src/main.rs @@ -122,7 +122,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -372,7 +372,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -475,7 +475,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["validate-only", "trigger-id"].iter().map(|v|*v)); + v.extend(["trigger-id", "validate-only"].iter().map(|v|*v)); v } )); } } @@ -537,7 +537,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["validate-only", "allow-missing", "etag"].iter().map(|v|*v)); + v.extend(["allow-missing", "etag", "validate-only"].iter().map(|v|*v)); v } )); } } @@ -707,7 +707,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "order-by"].iter().map(|v|*v)); + v.extend(["order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -813,7 +813,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["validate-only", "allow-missing", "update-mask"].iter().map(|v|*v)); + v.extend(["allow-missing", "update-mask", "validate-only"].iter().map(|v|*v)); v } )); } } diff --git a/gen/eventarc1/src/api.rs b/gen/eventarc1/src/api.rs index 5b1b2b7a14..9604b99055 100644 --- a/gen/eventarc1/src/api.rs +++ b/gen/eventarc1/src/api.rs @@ -1090,25 +1090,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1116,13 +1106,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1366,25 +1358,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1392,13 +1374,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1633,25 +1617,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1659,13 +1633,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1915,25 +1891,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1941,13 +1907,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2234,25 +2202,15 @@ impl<'a, C> ProjectLocationTriggerCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2260,13 +2218,15 @@ impl<'a, C> ProjectLocationTriggerCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2539,25 +2499,15 @@ impl<'a, C> ProjectLocationTriggerDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2565,13 +2515,15 @@ impl<'a, C> ProjectLocationTriggerDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2827,25 +2779,15 @@ impl<'a, C> ProjectLocationTriggerGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2853,13 +2795,15 @@ impl<'a, C> ProjectLocationTriggerGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3099,25 +3043,15 @@ impl<'a, C> ProjectLocationTriggerGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3125,13 +3059,15 @@ impl<'a, C> ProjectLocationTriggerGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3388,25 +3324,15 @@ impl<'a, C> ProjectLocationTriggerListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3414,13 +3340,15 @@ impl<'a, C> ProjectLocationTriggerListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3712,25 +3640,15 @@ impl<'a, C> ProjectLocationTriggerPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3738,13 +3656,15 @@ impl<'a, C> ProjectLocationTriggerPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4030,25 +3950,15 @@ impl<'a, C> ProjectLocationTriggerSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4056,13 +3966,15 @@ impl<'a, C> ProjectLocationTriggerSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4327,25 +4239,15 @@ impl<'a, C> ProjectLocationTriggerTestIamPermissionCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4353,13 +4255,15 @@ impl<'a, C> ProjectLocationTriggerTestIamPermissionCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4603,25 +4507,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4629,13 +4523,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4885,25 +4781,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4911,13 +4797,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/eventarc1/src/client.rs b/gen/eventarc1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/eventarc1/src/client.rs +++ b/gen/eventarc1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/factchecktools1_alpha1-cli/src/main.rs b/gen/factchecktools1_alpha1-cli/src/main.rs index ab1bf11d90..12fde5b54b 100644 --- a/gen/factchecktools1_alpha1-cli/src/main.rs +++ b/gen/factchecktools1_alpha1-cli/src/main.rs @@ -82,7 +82,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["offset", "review-publisher-site-filter", "page-size", "page-token", "query", "max-age-days", "language-code"].iter().map(|v|*v)); + v.extend(["language-code", "max-age-days", "offset", "page-size", "page-token", "query", "review-publisher-site-filter"].iter().map(|v|*v)); v } )); } } diff --git a/gen/factchecktools1_alpha1/src/api.rs b/gen/factchecktools1_alpha1/src/api.rs index bf762e0022..de66d4d4be 100644 --- a/gen/factchecktools1_alpha1/src/api.rs +++ b/gen/factchecktools1_alpha1/src/api.rs @@ -768,25 +768,15 @@ impl<'a, C> ClaimSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -794,13 +784,15 @@ impl<'a, C> ClaimSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1045,25 +1037,15 @@ impl<'a, C> PageCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1071,13 +1053,15 @@ impl<'a, C> PageCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1311,25 +1295,15 @@ impl<'a, C> PageDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1337,13 +1311,15 @@ impl<'a, C> PageDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1578,25 +1554,15 @@ impl<'a, C> PageGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1604,13 +1570,15 @@ impl<'a, C> PageGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1843,25 +1811,15 @@ impl<'a, C> PageListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1869,13 +1827,15 @@ impl<'a, C> PageListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2156,25 +2116,15 @@ impl<'a, C> PageUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2182,13 +2132,15 @@ impl<'a, C> PageUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/factchecktools1_alpha1/src/client.rs b/gen/factchecktools1_alpha1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/factchecktools1_alpha1/src/client.rs +++ b/gen/factchecktools1_alpha1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/fcm1/src/api.rs b/gen/fcm1/src/api.rs index 35bb59e1cd..9d2bdb922c 100644 --- a/gen/fcm1/src/api.rs +++ b/gen/fcm1/src/api.rs @@ -719,25 +719,15 @@ impl<'a, C> ProjectMessageSendCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -745,13 +735,15 @@ impl<'a, C> ProjectMessageSendCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/fcm1/src/client.rs b/gen/fcm1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/fcm1/src/client.rs +++ b/gen/fcm1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/file1-cli/src/main.rs b/gen/file1-cli/src/main.rs index 31b968e5da..645a2f8f45 100644 --- a/gen/file1-cli/src/main.rs +++ b/gen/file1-cli/src/main.rs @@ -276,7 +276,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "page-size", "page-token", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -692,7 +692,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "page-size", "page-token", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -939,7 +939,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "page-size", "include-unrevealed-locations", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "include-unrevealed-locations", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/file1/src/api.rs b/gen/file1/src/api.rs index a214671302..3cab447d3e 100644 --- a/gen/file1/src/api.rs +++ b/gen/file1/src/api.rs @@ -1086,25 +1086,15 @@ impl<'a, C> ProjectLocationBackupCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1112,13 +1102,15 @@ impl<'a, C> ProjectLocationBackupCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1369,25 +1361,15 @@ impl<'a, C> ProjectLocationBackupDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1395,13 +1377,15 @@ impl<'a, C> ProjectLocationBackupDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1636,25 +1620,15 @@ impl<'a, C> ProjectLocationBackupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1662,13 +1636,15 @@ impl<'a, C> ProjectLocationBackupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1923,25 +1899,15 @@ impl<'a, C> ProjectLocationBackupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1949,13 +1915,15 @@ impl<'a, C> ProjectLocationBackupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2244,25 +2212,15 @@ impl<'a, C> ProjectLocationBackupPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2270,13 +2228,15 @@ impl<'a, C> ProjectLocationBackupPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2553,25 +2513,15 @@ impl<'a, C> ProjectLocationInstanceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2579,13 +2529,15 @@ impl<'a, C> ProjectLocationInstanceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2836,25 +2788,15 @@ impl<'a, C> ProjectLocationInstanceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2862,13 +2804,15 @@ impl<'a, C> ProjectLocationInstanceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3103,25 +3047,15 @@ impl<'a, C> ProjectLocationInstanceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3129,13 +3063,15 @@ impl<'a, C> ProjectLocationInstanceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3390,25 +3326,15 @@ impl<'a, C> ProjectLocationInstanceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3416,13 +3342,15 @@ impl<'a, C> ProjectLocationInstanceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3711,25 +3639,15 @@ impl<'a, C> ProjectLocationInstancePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3737,13 +3655,15 @@ impl<'a, C> ProjectLocationInstancePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4015,25 +3935,15 @@ impl<'a, C> ProjectLocationInstanceRestoreCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4041,13 +3951,15 @@ impl<'a, C> ProjectLocationInstanceRestoreCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4312,25 +4224,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4338,13 +4240,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4588,25 +4492,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4614,13 +4508,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4855,25 +4751,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4881,13 +4767,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5137,25 +5025,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5163,13 +5041,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5425,25 +5305,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5451,13 +5321,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5712,25 +5584,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5738,13 +5600,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/file1/src/client.rs b/gen/file1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/file1/src/client.rs +++ b/gen/file1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/file1_beta1-cli/src/main.rs b/gen/file1_beta1-cli/src/main.rs index 966d027092..0e58a49f80 100644 --- a/gen/file1_beta1-cli/src/main.rs +++ b/gen/file1_beta1-cli/src/main.rs @@ -276,7 +276,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "order-by", "filter"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -692,7 +692,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "order-by", "filter"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -940,7 +940,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "include-unrevealed-locations", "filter"].iter().map(|v|*v)); + v.extend(["filter", "include-unrevealed-locations", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1190,7 +1190,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/file1_beta1/src/api.rs b/gen/file1_beta1/src/api.rs index 0ec6c68918..da823b17eb 100644 --- a/gen/file1_beta1/src/api.rs +++ b/gen/file1_beta1/src/api.rs @@ -1089,25 +1089,15 @@ impl<'a, C> ProjectLocationBackupCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1115,13 +1105,15 @@ impl<'a, C> ProjectLocationBackupCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1372,25 +1364,15 @@ impl<'a, C> ProjectLocationBackupDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1398,13 +1380,15 @@ impl<'a, C> ProjectLocationBackupDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1639,25 +1623,15 @@ impl<'a, C> ProjectLocationBackupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1665,13 +1639,15 @@ impl<'a, C> ProjectLocationBackupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1926,25 +1902,15 @@ impl<'a, C> ProjectLocationBackupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1952,13 +1918,15 @@ impl<'a, C> ProjectLocationBackupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2247,25 +2215,15 @@ impl<'a, C> ProjectLocationBackupPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2273,13 +2231,15 @@ impl<'a, C> ProjectLocationBackupPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2556,25 +2516,15 @@ impl<'a, C> ProjectLocationInstanceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2582,13 +2532,15 @@ impl<'a, C> ProjectLocationInstanceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2839,25 +2791,15 @@ impl<'a, C> ProjectLocationInstanceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2865,13 +2807,15 @@ impl<'a, C> ProjectLocationInstanceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3106,25 +3050,15 @@ impl<'a, C> ProjectLocationInstanceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3132,13 +3066,15 @@ impl<'a, C> ProjectLocationInstanceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3393,25 +3329,15 @@ impl<'a, C> ProjectLocationInstanceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3419,13 +3345,15 @@ impl<'a, C> ProjectLocationInstanceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3714,25 +3642,15 @@ impl<'a, C> ProjectLocationInstancePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3740,13 +3658,15 @@ impl<'a, C> ProjectLocationInstancePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4018,25 +3938,15 @@ impl<'a, C> ProjectLocationInstanceRestoreCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4044,13 +3954,15 @@ impl<'a, C> ProjectLocationInstanceRestoreCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4315,25 +4227,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4341,13 +4243,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4591,25 +4495,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4617,13 +4511,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4858,25 +4754,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4884,13 +4770,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5140,25 +5028,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5166,13 +5044,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5428,25 +5308,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5454,13 +5324,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5715,25 +5587,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5741,13 +5603,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/file1_beta1/src/client.rs b/gen/file1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/file1_beta1/src/client.rs +++ b/gen/file1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/firebase1_beta1/src/api.rs b/gen/firebase1_beta1/src/api.rs index 741311eec4..b6ba30109d 100644 --- a/gen/firebase1_beta1/src/api.rs +++ b/gen/firebase1_beta1/src/api.rs @@ -1744,25 +1744,15 @@ impl<'a, C> AvailableProjectListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1770,13 +1760,15 @@ impl<'a, C> AvailableProjectListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2015,25 +2007,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2041,13 +2023,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2303,25 +2287,15 @@ impl<'a, C> ProjectAndroidAppShaCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2329,13 +2303,15 @@ impl<'a, C> ProjectAndroidAppShaCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2579,25 +2555,15 @@ impl<'a, C> ProjectAndroidAppShaDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2605,13 +2571,15 @@ impl<'a, C> ProjectAndroidAppShaDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2846,25 +2814,15 @@ impl<'a, C> ProjectAndroidAppShaListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2872,13 +2830,15 @@ impl<'a, C> ProjectAndroidAppShaListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3134,25 +3094,15 @@ impl<'a, C> ProjectAndroidAppCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3160,13 +3110,15 @@ impl<'a, C> ProjectAndroidAppCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3410,25 +3362,15 @@ impl<'a, C> ProjectAndroidAppGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3436,13 +3378,15 @@ impl<'a, C> ProjectAndroidAppGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3677,25 +3621,15 @@ impl<'a, C> ProjectAndroidAppGetConfigCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3703,13 +3637,15 @@ impl<'a, C> ProjectAndroidAppGetConfigCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3954,25 +3890,15 @@ impl<'a, C> ProjectAndroidAppListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3980,13 +3906,15 @@ impl<'a, C> ProjectAndroidAppListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4261,25 +4189,15 @@ impl<'a, C> ProjectAndroidAppPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4287,13 +4205,15 @@ impl<'a, C> ProjectAndroidAppPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4554,25 +4474,15 @@ impl<'a, C> ProjectAvailableLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4580,13 +4490,15 @@ impl<'a, C> ProjectAvailableLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4856,25 +4768,15 @@ impl<'a, C> ProjectDefaultLocationFinalizeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4882,13 +4784,15 @@ impl<'a, C> ProjectDefaultLocationFinalizeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5153,25 +5057,15 @@ impl<'a, C> ProjectIosAppCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5179,13 +5073,15 @@ impl<'a, C> ProjectIosAppCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5429,25 +5325,15 @@ impl<'a, C> ProjectIosAppGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5455,13 +5341,15 @@ impl<'a, C> ProjectIosAppGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5696,25 +5584,15 @@ impl<'a, C> ProjectIosAppGetConfigCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5722,13 +5600,15 @@ impl<'a, C> ProjectIosAppGetConfigCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5973,25 +5853,15 @@ impl<'a, C> ProjectIosAppListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5999,13 +5869,15 @@ impl<'a, C> ProjectIosAppListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6280,25 +6152,15 @@ impl<'a, C> ProjectIosAppPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6306,13 +6168,15 @@ impl<'a, C> ProjectIosAppPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6584,25 +6448,15 @@ impl<'a, C> ProjectWebAppCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6610,13 +6464,15 @@ impl<'a, C> ProjectWebAppCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6860,25 +6716,15 @@ impl<'a, C> ProjectWebAppGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6886,13 +6732,15 @@ impl<'a, C> ProjectWebAppGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7127,25 +6975,15 @@ impl<'a, C> ProjectWebAppGetConfigCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7153,13 +6991,15 @@ impl<'a, C> ProjectWebAppGetConfigCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7404,25 +7244,15 @@ impl<'a, C> ProjectWebAppListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7430,13 +7260,15 @@ impl<'a, C> ProjectWebAppListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7711,25 +7543,15 @@ impl<'a, C> ProjectWebAppPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7737,13 +7559,15 @@ impl<'a, C> ProjectWebAppPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8015,25 +7839,15 @@ impl<'a, C> ProjectAddFirebaseCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8041,13 +7855,15 @@ impl<'a, C> ProjectAddFirebaseCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8312,25 +8128,15 @@ impl<'a, C> ProjectAddGoogleAnalyticCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8338,13 +8144,15 @@ impl<'a, C> ProjectAddGoogleAnalyticCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8588,25 +8396,15 @@ impl<'a, C> ProjectGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8614,13 +8412,15 @@ impl<'a, C> ProjectGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8855,25 +8655,15 @@ impl<'a, C> ProjectGetAdminSdkConfigCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8881,13 +8671,15 @@ impl<'a, C> ProjectGetAdminSdkConfigCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9122,25 +8914,15 @@ impl<'a, C> ProjectGetAnalyticsDetailCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9148,13 +8930,15 @@ impl<'a, C> ProjectGetAnalyticsDetailCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9372,25 +9156,15 @@ impl<'a, C> ProjectListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9398,13 +9172,15 @@ impl<'a, C> ProjectListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9669,25 +9445,15 @@ impl<'a, C> ProjectPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9695,13 +9461,15 @@ impl<'a, C> ProjectPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9973,25 +9741,15 @@ impl<'a, C> ProjectRemoveAnalyticCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9999,13 +9757,15 @@ impl<'a, C> ProjectRemoveAnalyticCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10264,25 +10024,15 @@ impl<'a, C> ProjectSearchAppCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10290,13 +10040,15 @@ impl<'a, C> ProjectSearchAppCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/firebase1_beta1/src/client.rs b/gen/firebase1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/firebase1_beta1/src/client.rs +++ b/gen/firebase1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/firebasedatabase1_beta/src/api.rs b/gen/firebasedatabase1_beta/src/api.rs index 734fbb9865..cfcdece69a 100644 --- a/gen/firebasedatabase1_beta/src/api.rs +++ b/gen/firebasedatabase1_beta/src/api.rs @@ -602,25 +602,15 @@ impl<'a, C> ProjectLocationInstanceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -628,13 +618,15 @@ impl<'a, C> ProjectLocationInstanceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -892,25 +884,15 @@ impl<'a, C> ProjectLocationInstanceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -918,13 +900,15 @@ impl<'a, C> ProjectLocationInstanceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1180,25 +1164,15 @@ impl<'a, C> ProjectLocationInstanceDisableCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1206,13 +1180,15 @@ impl<'a, C> ProjectLocationInstanceDisableCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1456,25 +1432,15 @@ impl<'a, C> ProjectLocationInstanceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1482,13 +1448,15 @@ impl<'a, C> ProjectLocationInstanceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1733,25 +1701,15 @@ impl<'a, C> ProjectLocationInstanceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1759,13 +1717,15 @@ impl<'a, C> ProjectLocationInstanceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2035,25 +1995,15 @@ impl<'a, C> ProjectLocationInstanceReenableCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2061,13 +2011,15 @@ impl<'a, C> ProjectLocationInstanceReenableCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/firebasedatabase1_beta/src/client.rs b/gen/firebasedatabase1_beta/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/firebasedatabase1_beta/src/client.rs +++ b/gen/firebasedatabase1_beta/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/firebasedynamiclinks1/src/api.rs b/gen/firebasedynamiclinks1/src/api.rs index 74753d97bb..964cfb79c6 100644 --- a/gen/firebasedynamiclinks1/src/api.rs +++ b/gen/firebasedynamiclinks1/src/api.rs @@ -1147,25 +1147,15 @@ impl<'a, C> ManagedShortLinkCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1173,13 +1163,15 @@ impl<'a, C> ManagedShortLinkCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1407,25 +1399,15 @@ impl<'a, C> ShortLinkCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1433,13 +1415,15 @@ impl<'a, C> ShortLinkCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1679,25 +1663,15 @@ impl<'a, C> MethodGetLinkStatCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1705,13 +1679,15 @@ impl<'a, C> MethodGetLinkStatCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1954,25 +1930,15 @@ impl<'a, C> MethodInstallAttributionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1980,13 +1946,15 @@ impl<'a, C> MethodInstallAttributionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2214,25 +2182,15 @@ impl<'a, C> MethodReopenAttributionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2240,13 +2198,15 @@ impl<'a, C> MethodReopenAttributionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/firebasedynamiclinks1/src/client.rs b/gen/firebasedynamiclinks1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/firebasedynamiclinks1/src/client.rs +++ b/gen/firebasedynamiclinks1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/firebasehosting1-cli/src/main.rs b/gen/firebasehosting1-cli/src/main.rs index 05efd763e9..6a3ecd66d8 100644 --- a/gen/firebasehosting1-cli/src/main.rs +++ b/gen/firebasehosting1-cli/src/main.rs @@ -200,7 +200,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/firebasehosting1/src/api.rs b/gen/firebasehosting1/src/api.rs index 463128822b..8b3af32ac9 100644 --- a/gen/firebasehosting1/src/api.rs +++ b/gen/firebasehosting1/src/api.rs @@ -499,25 +499,15 @@ impl<'a, C> OperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -525,13 +515,15 @@ impl<'a, C> OperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -744,25 +736,15 @@ impl<'a, C> OperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -770,13 +752,15 @@ impl<'a, C> OperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -995,25 +979,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1021,13 +995,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/firebasehosting1/src/client.rs b/gen/firebasehosting1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/firebasehosting1/src/client.rs +++ b/gen/firebasehosting1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/firebasehosting1_beta1-cli/src/main.rs b/gen/firebasehosting1_beta1-cli/src/main.rs index 9a80580402..64d011a03a 100644 --- a/gen/firebasehosting1_beta1-cli/src/main.rs +++ b/gen/firebasehosting1_beta1-cli/src/main.rs @@ -1980,7 +1980,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["status", "page-size", "page-token"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "status"].iter().map(|v|*v)); v } )); } } @@ -3806,7 +3806,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["status", "page-size", "page-token"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "status"].iter().map(|v|*v)); v } )); } } diff --git a/gen/firebasehosting1_beta1/src/api.rs b/gen/firebasehosting1_beta1/src/api.rs index fa1311b788..a462121532 100644 --- a/gen/firebasehosting1_beta1/src/api.rs +++ b/gen/firebasehosting1_beta1/src/api.rs @@ -2178,25 +2178,15 @@ impl<'a, C> ProjectOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2204,13 +2194,15 @@ impl<'a, C> ProjectOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2471,25 +2463,15 @@ impl<'a, C> ProjectSiteChannelReleaseCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2497,13 +2479,15 @@ impl<'a, C> ProjectSiteChannelReleaseCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2764,25 +2748,15 @@ impl<'a, C> ProjectSiteChannelReleaseListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2790,13 +2764,15 @@ impl<'a, C> ProjectSiteChannelReleaseListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3071,25 +3047,15 @@ impl<'a, C> ProjectSiteChannelCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3097,13 +3063,15 @@ impl<'a, C> ProjectSiteChannelCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3354,25 +3322,15 @@ impl<'a, C> ProjectSiteChannelDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3380,13 +3338,15 @@ impl<'a, C> ProjectSiteChannelDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3621,25 +3581,15 @@ impl<'a, C> ProjectSiteChannelGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3647,13 +3597,15 @@ impl<'a, C> ProjectSiteChannelGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3898,25 +3850,15 @@ impl<'a, C> ProjectSiteChannelListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3924,13 +3866,15 @@ impl<'a, C> ProjectSiteChannelListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4205,25 +4149,15 @@ impl<'a, C> ProjectSiteChannelPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4231,13 +4165,15 @@ impl<'a, C> ProjectSiteChannelPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4509,25 +4445,15 @@ impl<'a, C> ProjectSiteDomainCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4535,13 +4461,15 @@ impl<'a, C> ProjectSiteDomainCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4785,25 +4713,15 @@ impl<'a, C> ProjectSiteDomainDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4811,13 +4729,15 @@ impl<'a, C> ProjectSiteDomainDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5052,25 +4972,15 @@ impl<'a, C> ProjectSiteDomainGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5078,13 +4988,15 @@ impl<'a, C> ProjectSiteDomainGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5329,25 +5241,15 @@ impl<'a, C> ProjectSiteDomainListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5355,13 +5257,15 @@ impl<'a, C> ProjectSiteDomainListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5631,25 +5535,15 @@ impl<'a, C> ProjectSiteDomainUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5657,13 +5551,15 @@ impl<'a, C> ProjectSiteDomainUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5933,25 +5829,15 @@ impl<'a, C> ProjectSiteReleaseCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5959,13 +5845,15 @@ impl<'a, C> ProjectSiteReleaseCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6226,25 +6114,15 @@ impl<'a, C> ProjectSiteReleaseListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6252,13 +6130,15 @@ impl<'a, C> ProjectSiteReleaseListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6522,25 +6402,15 @@ impl<'a, C> ProjectSiteVersionFileListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6548,13 +6418,15 @@ impl<'a, C> ProjectSiteVersionFileListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6831,25 +6703,15 @@ impl<'a, C> ProjectSiteVersionCloneCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6857,13 +6719,15 @@ impl<'a, C> ProjectSiteVersionCloneCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7138,25 +7002,15 @@ impl<'a, C> ProjectSiteVersionCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7164,13 +7018,15 @@ impl<'a, C> ProjectSiteVersionCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7428,25 +7284,15 @@ impl<'a, C> ProjectSiteVersionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7454,13 +7300,15 @@ impl<'a, C> ProjectSiteVersionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7710,25 +7558,15 @@ impl<'a, C> ProjectSiteVersionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7736,13 +7574,15 @@ impl<'a, C> ProjectSiteVersionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8024,25 +7864,15 @@ impl<'a, C> ProjectSiteVersionPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8050,13 +7880,15 @@ impl<'a, C> ProjectSiteVersionPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8328,25 +8160,15 @@ impl<'a, C> ProjectSiteVersionPopulateFileCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8354,13 +8176,15 @@ impl<'a, C> ProjectSiteVersionPopulateFileCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8630,25 +8454,15 @@ impl<'a, C> ProjectSiteCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8656,13 +8470,15 @@ impl<'a, C> ProjectSiteCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8913,25 +8729,15 @@ impl<'a, C> ProjectSiteDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8939,13 +8745,15 @@ impl<'a, C> ProjectSiteDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9180,25 +8988,15 @@ impl<'a, C> ProjectSiteGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9206,13 +9004,15 @@ impl<'a, C> ProjectSiteGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9447,25 +9247,15 @@ impl<'a, C> ProjectSiteGetConfigCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9473,13 +9263,15 @@ impl<'a, C> ProjectSiteGetConfigCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9724,25 +9516,15 @@ impl<'a, C> ProjectSiteListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9750,13 +9532,15 @@ impl<'a, C> ProjectSiteListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10031,25 +9815,15 @@ impl<'a, C> ProjectSitePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10057,13 +9831,15 @@ impl<'a, C> ProjectSitePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10340,25 +10116,15 @@ impl<'a, C> ProjectSiteUpdateConfigCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10366,13 +10132,15 @@ impl<'a, C> ProjectSiteUpdateConfigCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10649,25 +10417,15 @@ impl<'a, C> SiteChannelReleaseCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10675,13 +10433,15 @@ impl<'a, C> SiteChannelReleaseCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10942,25 +10702,15 @@ impl<'a, C> SiteChannelReleaseListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10968,13 +10718,15 @@ impl<'a, C> SiteChannelReleaseListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11249,25 +11001,15 @@ impl<'a, C> SiteChannelCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11275,13 +11017,15 @@ impl<'a, C> SiteChannelCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11532,25 +11276,15 @@ impl<'a, C> SiteChannelDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11558,13 +11292,15 @@ impl<'a, C> SiteChannelDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11799,25 +11535,15 @@ impl<'a, C> SiteChannelGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11825,13 +11551,15 @@ impl<'a, C> SiteChannelGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12076,25 +11804,15 @@ impl<'a, C> SiteChannelListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12102,13 +11820,15 @@ impl<'a, C> SiteChannelListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12383,25 +12103,15 @@ impl<'a, C> SiteChannelPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12409,13 +12119,15 @@ impl<'a, C> SiteChannelPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12687,25 +12399,15 @@ impl<'a, C> SiteDomainCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12713,13 +12415,15 @@ impl<'a, C> SiteDomainCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12963,25 +12667,15 @@ impl<'a, C> SiteDomainDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12989,13 +12683,15 @@ impl<'a, C> SiteDomainDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13230,25 +12926,15 @@ impl<'a, C> SiteDomainGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13256,13 +12942,15 @@ impl<'a, C> SiteDomainGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13507,25 +13195,15 @@ impl<'a, C> SiteDomainListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13533,13 +13211,15 @@ impl<'a, C> SiteDomainListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13809,25 +13489,15 @@ impl<'a, C> SiteDomainUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13835,13 +13505,15 @@ impl<'a, C> SiteDomainUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14111,25 +13783,15 @@ impl<'a, C> SiteReleaseCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14137,13 +13799,15 @@ impl<'a, C> SiteReleaseCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14404,25 +14068,15 @@ impl<'a, C> SiteReleaseListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14430,13 +14084,15 @@ impl<'a, C> SiteReleaseListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14700,25 +14356,15 @@ impl<'a, C> SiteVersionFileListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14726,13 +14372,15 @@ impl<'a, C> SiteVersionFileListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15009,25 +14657,15 @@ impl<'a, C> SiteVersionCloneCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15035,13 +14673,15 @@ impl<'a, C> SiteVersionCloneCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15316,25 +14956,15 @@ impl<'a, C> SiteVersionCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15342,13 +14972,15 @@ impl<'a, C> SiteVersionCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15606,25 +15238,15 @@ impl<'a, C> SiteVersionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15632,13 +15254,15 @@ impl<'a, C> SiteVersionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15888,25 +15512,15 @@ impl<'a, C> SiteVersionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15914,13 +15528,15 @@ impl<'a, C> SiteVersionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16202,25 +15818,15 @@ impl<'a, C> SiteVersionPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16228,13 +15834,15 @@ impl<'a, C> SiteVersionPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16506,25 +16114,15 @@ impl<'a, C> SiteVersionPopulateFileCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16532,13 +16130,15 @@ impl<'a, C> SiteVersionPopulateFileCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16782,25 +16382,15 @@ impl<'a, C> SiteGetConfigCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16808,13 +16398,15 @@ impl<'a, C> SiteGetConfigCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17075,25 +16667,15 @@ impl<'a, C> SiteUpdateConfigCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17101,13 +16683,15 @@ impl<'a, C> SiteUpdateConfigCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/firebasehosting1_beta1/src/client.rs b/gen/firebasehosting1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/firebasehosting1_beta1/src/client.rs +++ b/gen/firebasehosting1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/firebaseml1/src/api.rs b/gen/firebaseml1/src/api.rs index 5a00049bf7..0e7138aceb 100644 --- a/gen/firebaseml1/src/api.rs +++ b/gen/firebaseml1/src/api.rs @@ -532,25 +532,15 @@ impl<'a, C> OperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -558,13 +548,15 @@ impl<'a, C> OperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -808,25 +800,15 @@ impl<'a, C> OperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -834,13 +816,15 @@ impl<'a, C> OperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1090,25 +1074,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1116,13 +1090,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/firebaseml1/src/client.rs b/gen/firebaseml1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/firebaseml1/src/client.rs +++ b/gen/firebaseml1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/firebaseremoteconfig1/src/api.rs b/gen/firebaseremoteconfig1/src/api.rs index bbe0a59dde..de38a2e393 100644 --- a/gen/firebaseremoteconfig1/src/api.rs +++ b/gen/firebaseremoteconfig1/src/api.rs @@ -520,25 +520,15 @@ impl<'a, C> ProjectGetRemoteConfigCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -546,13 +536,15 @@ impl<'a, C> ProjectGetRemoteConfigCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -802,25 +794,15 @@ impl<'a, C> ProjectUpdateRemoteConfigCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -828,13 +810,15 @@ impl<'a, C> ProjectUpdateRemoteConfigCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/firebaseremoteconfig1/src/client.rs b/gen/firebaseremoteconfig1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/firebaseremoteconfig1/src/client.rs +++ b/gen/firebaseremoteconfig1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/firebasestorage1_beta/src/api.rs b/gen/firebasestorage1_beta/src/api.rs index 6903ce8068..b647b65950 100644 --- a/gen/firebasestorage1_beta/src/api.rs +++ b/gen/firebasestorage1_beta/src/api.rs @@ -545,25 +545,15 @@ impl<'a, C> ProjectBucketAddFirebaseCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -571,13 +561,15 @@ impl<'a, C> ProjectBucketAddFirebaseCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -821,25 +813,15 @@ impl<'a, C> ProjectBucketGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -847,13 +829,15 @@ impl<'a, C> ProjectBucketGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1098,25 +1082,15 @@ impl<'a, C> ProjectBucketListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1124,13 +1098,15 @@ impl<'a, C> ProjectBucketListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1400,25 +1376,15 @@ impl<'a, C> ProjectBucketRemoveFirebaseCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1426,13 +1392,15 @@ impl<'a, C> ProjectBucketRemoveFirebaseCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/firebasestorage1_beta/src/client.rs b/gen/firebasestorage1_beta/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/firebasestorage1_beta/src/client.rs +++ b/gen/firebasestorage1_beta/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/firestore1-cli/src/main.rs b/gen/firestore1-cli/src/main.rs index 2c4e593f65..7c37799739 100644 --- a/gen/firestore1-cli/src/main.rs +++ b/gen/firestore1-cli/src/main.rs @@ -122,7 +122,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -467,7 +467,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -907,7 +907,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["mask-field-paths", "document-id"].iter().map(|v|*v)); + v.extend(["document-id", "mask-field-paths"].iter().map(|v|*v)); v } )); } } @@ -966,7 +966,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["current-document-update-time", "current-document-exists"].iter().map(|v|*v)); + v.extend(["current-document-exists", "current-document-update-time"].iter().map(|v|*v)); v } )); } } @@ -1028,7 +1028,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["read-time", "mask-field-paths", "transaction"].iter().map(|v|*v)); + v.extend(["mask-field-paths", "read-time", "transaction"].iter().map(|v|*v)); v } )); } } @@ -1102,7 +1102,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["read-time", "page-token", "page-size", "show-missing", "transaction", "mask-field-paths", "order-by"].iter().map(|v|*v)); + v.extend(["mask-field-paths", "order-by", "page-size", "page-token", "read-time", "show-missing", "transaction"].iter().map(|v|*v)); v } )); } } @@ -1505,7 +1505,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["update-mask-field-paths", "mask-field-paths", "current-document-update-time", "current-document-exists"].iter().map(|v|*v)); + v.extend(["current-document-exists", "current-document-update-time", "mask-field-paths", "update-mask-field-paths"].iter().map(|v|*v)); v } )); } } @@ -2206,7 +2206,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2320,7 +2320,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/firestore1/src/api.rs b/gen/firestore1/src/api.rs index 9b0774cf8e..64052e6e28 100644 --- a/gen/firestore1/src/api.rs +++ b/gen/firestore1/src/api.rs @@ -2339,25 +2339,15 @@ impl<'a, C> ProjectDatabaseCollectionGroupFieldGetCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2365,13 +2355,15 @@ impl<'a, C> ProjectDatabaseCollectionGroupFieldGetCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2621,25 +2613,15 @@ impl<'a, C> ProjectDatabaseCollectionGroupFieldListCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2647,13 +2629,15 @@ impl<'a, C> ProjectDatabaseCollectionGroupFieldListCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2935,25 +2919,15 @@ impl<'a, C> ProjectDatabaseCollectionGroupFieldPatchCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2961,13 +2935,15 @@ impl<'a, C> ProjectDatabaseCollectionGroupFieldPatchCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3239,25 +3215,15 @@ impl<'a, C> ProjectDatabaseCollectionGroupIndexeCreateCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3265,13 +3231,15 @@ impl<'a, C> ProjectDatabaseCollectionGroupIndexeCreateCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3515,25 +3483,15 @@ impl<'a, C> ProjectDatabaseCollectionGroupIndexeDeleteCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3541,13 +3499,15 @@ impl<'a, C> ProjectDatabaseCollectionGroupIndexeDeleteCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3782,25 +3742,15 @@ impl<'a, C> ProjectDatabaseCollectionGroupIndexeGetCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3808,13 +3758,15 @@ impl<'a, C> ProjectDatabaseCollectionGroupIndexeGetCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4064,25 +4016,15 @@ impl<'a, C> ProjectDatabaseCollectionGroupIndexeListCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4090,13 +4032,15 @@ impl<'a, C> ProjectDatabaseCollectionGroupIndexeListCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4373,25 +4317,15 @@ impl<'a, C> ProjectDatabaseDocumentBatchGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4399,13 +4333,15 @@ impl<'a, C> ProjectDatabaseDocumentBatchGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4670,25 +4606,15 @@ impl<'a, C> ProjectDatabaseDocumentBatchWriteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4696,13 +4622,15 @@ impl<'a, C> ProjectDatabaseDocumentBatchWriteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4967,25 +4895,15 @@ impl<'a, C> ProjectDatabaseDocumentBeginTransactionCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4993,13 +4911,15 @@ impl<'a, C> ProjectDatabaseDocumentBeginTransactionCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5264,25 +5184,15 @@ impl<'a, C> ProjectDatabaseDocumentCommitCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5290,13 +5200,15 @@ impl<'a, C> ProjectDatabaseDocumentCommitCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5575,25 +5487,15 @@ impl<'a, C> ProjectDatabaseDocumentCreateDocumentCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5601,13 +5503,15 @@ impl<'a, C> ProjectDatabaseDocumentCreateDocumentCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5886,25 +5790,15 @@ impl<'a, C> ProjectDatabaseDocumentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5912,13 +5806,15 @@ impl<'a, C> ProjectDatabaseDocumentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6184,25 +6080,15 @@ impl<'a, C> ProjectDatabaseDocumentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6210,13 +6096,15 @@ impl<'a, C> ProjectDatabaseDocumentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6512,25 +6400,15 @@ impl<'a, C> ProjectDatabaseDocumentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6538,13 +6416,15 @@ impl<'a, C> ProjectDatabaseDocumentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6860,25 +6740,15 @@ impl<'a, C> ProjectDatabaseDocumentListCollectionIdCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6886,13 +6756,15 @@ impl<'a, C> ProjectDatabaseDocumentListCollectionIdCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7157,25 +7029,15 @@ impl<'a, C> ProjectDatabaseDocumentListenCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7183,13 +7045,15 @@ impl<'a, C> ProjectDatabaseDocumentListenCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7454,25 +7318,15 @@ impl<'a, C> ProjectDatabaseDocumentPartitionQueryCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7480,13 +7334,15 @@ impl<'a, C> ProjectDatabaseDocumentPartitionQueryCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7775,25 +7631,15 @@ impl<'a, C> ProjectDatabaseDocumentPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7801,13 +7647,15 @@ impl<'a, C> ProjectDatabaseDocumentPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8102,25 +7950,15 @@ impl<'a, C> ProjectDatabaseDocumentRollbackCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8128,13 +7966,15 @@ impl<'a, C> ProjectDatabaseDocumentRollbackCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8399,25 +8239,15 @@ impl<'a, C> ProjectDatabaseDocumentRunQueryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8425,13 +8255,15 @@ impl<'a, C> ProjectDatabaseDocumentRunQueryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8696,25 +8528,15 @@ impl<'a, C> ProjectDatabaseDocumentWriteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8722,13 +8544,15 @@ impl<'a, C> ProjectDatabaseDocumentWriteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8993,25 +8817,15 @@ impl<'a, C> ProjectDatabaseOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9019,13 +8833,15 @@ impl<'a, C> ProjectDatabaseOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9269,25 +9085,15 @@ impl<'a, C> ProjectDatabaseOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9295,13 +9101,15 @@ impl<'a, C> ProjectDatabaseOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9536,25 +9344,15 @@ impl<'a, C> ProjectDatabaseOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9562,13 +9360,15 @@ impl<'a, C> ProjectDatabaseOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9818,25 +9618,15 @@ impl<'a, C> ProjectDatabaseOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9844,13 +9634,15 @@ impl<'a, C> ProjectDatabaseOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10127,25 +9919,15 @@ impl<'a, C> ProjectDatabaseExportDocumentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10153,13 +9935,15 @@ impl<'a, C> ProjectDatabaseExportDocumentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10424,25 +10208,15 @@ impl<'a, C> ProjectDatabaseImportDocumentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10450,13 +10224,15 @@ impl<'a, C> ProjectDatabaseImportDocumentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10700,25 +10476,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10726,13 +10492,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10982,25 +10750,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11008,13 +10766,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/firestore1/src/client.rs b/gen/firestore1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/firestore1/src/client.rs +++ b/gen/firestore1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/firestore1_beta1-cli/src/main.rs b/gen/firestore1_beta1-cli/src/main.rs index 57cd403292..340347cc14 100644 --- a/gen/firestore1_beta1-cli/src/main.rs +++ b/gen/firestore1_beta1-cli/src/main.rs @@ -448,7 +448,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["mask-field-paths", "document-id"].iter().map(|v|*v)); + v.extend(["document-id", "mask-field-paths"].iter().map(|v|*v)); v } )); } } @@ -569,7 +569,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["transaction", "mask-field-paths", "read-time"].iter().map(|v|*v)); + v.extend(["mask-field-paths", "read-time", "transaction"].iter().map(|v|*v)); v } )); } } @@ -643,7 +643,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["order-by", "page-token", "page-size", "show-missing", "transaction", "mask-field-paths", "read-time"].iter().map(|v|*v)); + v.extend(["mask-field-paths", "order-by", "page-size", "page-token", "read-time", "show-missing", "transaction"].iter().map(|v|*v)); v } )); } } @@ -1046,7 +1046,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["current-document-exists", "update-mask-field-paths", "mask-field-paths", "current-document-update-time"].iter().map(|v|*v)); + v.extend(["current-document-exists", "current-document-update-time", "mask-field-paths", "update-mask-field-paths"].iter().map(|v|*v)); v } )); } } @@ -1750,7 +1750,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/firestore1_beta1/src/api.rs b/gen/firestore1_beta1/src/api.rs index 611a941bb5..3768268c29 100644 --- a/gen/firestore1_beta1/src/api.rs +++ b/gen/firestore1_beta1/src/api.rs @@ -2035,25 +2035,15 @@ impl<'a, C> ProjectDatabaseDocumentBatchGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2061,13 +2051,15 @@ impl<'a, C> ProjectDatabaseDocumentBatchGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2332,25 +2324,15 @@ impl<'a, C> ProjectDatabaseDocumentBatchWriteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2358,13 +2340,15 @@ impl<'a, C> ProjectDatabaseDocumentBatchWriteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2629,25 +2613,15 @@ impl<'a, C> ProjectDatabaseDocumentBeginTransactionCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2655,13 +2629,15 @@ impl<'a, C> ProjectDatabaseDocumentBeginTransactionCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2926,25 +2902,15 @@ impl<'a, C> ProjectDatabaseDocumentCommitCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2952,13 +2918,15 @@ impl<'a, C> ProjectDatabaseDocumentCommitCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3237,25 +3205,15 @@ impl<'a, C> ProjectDatabaseDocumentCreateDocumentCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3263,13 +3221,15 @@ impl<'a, C> ProjectDatabaseDocumentCreateDocumentCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3548,25 +3508,15 @@ impl<'a, C> ProjectDatabaseDocumentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3574,13 +3524,15 @@ impl<'a, C> ProjectDatabaseDocumentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3846,25 +3798,15 @@ impl<'a, C> ProjectDatabaseDocumentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3872,13 +3814,15 @@ impl<'a, C> ProjectDatabaseDocumentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4174,25 +4118,15 @@ impl<'a, C> ProjectDatabaseDocumentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4200,13 +4134,15 @@ impl<'a, C> ProjectDatabaseDocumentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4522,25 +4458,15 @@ impl<'a, C> ProjectDatabaseDocumentListCollectionIdCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4548,13 +4474,15 @@ impl<'a, C> ProjectDatabaseDocumentListCollectionIdCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4819,25 +4747,15 @@ impl<'a, C> ProjectDatabaseDocumentListenCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4845,13 +4763,15 @@ impl<'a, C> ProjectDatabaseDocumentListenCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5116,25 +5036,15 @@ impl<'a, C> ProjectDatabaseDocumentPartitionQueryCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5142,13 +5052,15 @@ impl<'a, C> ProjectDatabaseDocumentPartitionQueryCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5437,25 +5349,15 @@ impl<'a, C> ProjectDatabaseDocumentPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5463,13 +5365,15 @@ impl<'a, C> ProjectDatabaseDocumentPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5764,25 +5668,15 @@ impl<'a, C> ProjectDatabaseDocumentRollbackCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5790,13 +5684,15 @@ impl<'a, C> ProjectDatabaseDocumentRollbackCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6061,25 +5957,15 @@ impl<'a, C> ProjectDatabaseDocumentRunQueryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6087,13 +5973,15 @@ impl<'a, C> ProjectDatabaseDocumentRunQueryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6358,25 +6246,15 @@ impl<'a, C> ProjectDatabaseDocumentWriteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6384,13 +6262,15 @@ impl<'a, C> ProjectDatabaseDocumentWriteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6655,25 +6535,15 @@ impl<'a, C> ProjectDatabaseIndexeCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6681,13 +6551,15 @@ impl<'a, C> ProjectDatabaseIndexeCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6931,25 +6803,15 @@ impl<'a, C> ProjectDatabaseIndexeDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6957,13 +6819,15 @@ impl<'a, C> ProjectDatabaseIndexeDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7198,25 +7062,15 @@ impl<'a, C> ProjectDatabaseIndexeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7224,13 +7078,15 @@ impl<'a, C> ProjectDatabaseIndexeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7480,25 +7336,15 @@ impl<'a, C> ProjectDatabaseIndexeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7506,13 +7352,15 @@ impl<'a, C> ProjectDatabaseIndexeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7788,25 +7636,15 @@ impl<'a, C> ProjectDatabaseExportDocumentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7814,13 +7652,15 @@ impl<'a, C> ProjectDatabaseExportDocumentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8085,25 +7925,15 @@ impl<'a, C> ProjectDatabaseImportDocumentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8111,13 +7941,15 @@ impl<'a, C> ProjectDatabaseImportDocumentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/firestore1_beta1/src/client.rs b/gen/firestore1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/firestore1_beta1/src/client.rs +++ b/gen/firestore1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/fitness1-cli/src/main.rs b/gen/fitness1-cli/src/main.rs index 0d310615ab..b2fdaac55c 100644 --- a/gen/fitness1-cli/src/main.rs +++ b/gen/fitness1-cli/src/main.rs @@ -166,7 +166,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "limit"].iter().map(|v|*v)); + v.extend(["limit", "page-token"].iter().map(|v|*v)); v } )); } } @@ -269,7 +269,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "limit"].iter().map(|v|*v)); + v.extend(["limit", "page-token"].iter().map(|v|*v)); v } )); } } @@ -824,7 +824,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["include-deleted", "page-token", "start-time", "end-time", "activity-type"].iter().map(|v|*v)); + v.extend(["activity-type", "end-time", "include-deleted", "page-token", "start-time"].iter().map(|v|*v)); v } )); } } diff --git a/gen/fitness1/src/api.rs b/gen/fitness1/src/api.rs index 2cfff29c0f..84f4b3a3b1 100644 --- a/gen/fitness1/src/api.rs +++ b/gen/fitness1/src/api.rs @@ -1233,25 +1233,15 @@ impl<'a, C> UserDataSourceDataPointChangeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1259,13 +1249,15 @@ impl<'a, C> UserDataSourceDataPointChangeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1523,25 +1515,15 @@ impl<'a, C> UserDataSourceDatasetDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1549,11 +1531,11 @@ impl<'a, C> UserDataSourceDatasetDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -1812,25 +1794,15 @@ impl<'a, C> UserDataSourceDatasetGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1838,13 +1810,15 @@ impl<'a, C> UserDataSourceDatasetGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2134,25 +2108,15 @@ impl<'a, C> UserDataSourceDatasetPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2160,13 +2124,15 @@ impl<'a, C> UserDataSourceDatasetPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2447,25 +2413,15 @@ impl<'a, C> UserDataSourceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2473,13 +2429,15 @@ impl<'a, C> UserDataSourceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2721,25 +2679,15 @@ impl<'a, C> UserDataSourceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2747,13 +2695,15 @@ impl<'a, C> UserDataSourceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2996,25 +2946,15 @@ impl<'a, C> UserDataSourceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3022,13 +2962,15 @@ impl<'a, C> UserDataSourceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3276,25 +3218,15 @@ impl<'a, C> UserDataSourceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3302,13 +3234,15 @@ impl<'a, C> UserDataSourceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3570,25 +3504,15 @@ impl<'a, C> UserDataSourceUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3596,13 +3520,15 @@ impl<'a, C> UserDataSourceUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3873,25 +3799,15 @@ impl<'a, C> UserDatasetAggregateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3899,13 +3815,15 @@ impl<'a, C> UserDatasetAggregateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4146,25 +4064,15 @@ impl<'a, C> UserSessionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4172,11 +4080,11 @@ impl<'a, C> UserSessionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -4438,25 +4346,15 @@ impl<'a, C> UserSessionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4464,13 +4362,15 @@ impl<'a, C> UserSessionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4760,25 +4660,15 @@ impl<'a, C> UserSessionUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4786,13 +4676,15 @@ impl<'a, C> UserSessionUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/fitness1/src/client.rs b/gen/fitness1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/fitness1/src/client.rs +++ b/gen/fitness1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/fusiontables2-cli/src/main.rs b/gen/fusiontables2-cli/src/main.rs index fb550822bd..db53150d2c 100644 --- a/gen/fusiontables2-cli/src/main.rs +++ b/gen/fusiontables2-cli/src/main.rs @@ -1334,7 +1334,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["is-strict", "delimiter", "end-line", "encoding", "start-line"].iter().map(|v|*v)); + v.extend(["delimiter", "encoding", "end-line", "is-strict", "start-line"].iter().map(|v|*v)); v } )); } } @@ -1774,7 +1774,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["is-strict", "delimiter", "end-line", "encoding", "start-line"].iter().map(|v|*v)); + v.extend(["delimiter", "encoding", "end-line", "is-strict", "start-line"].iter().map(|v|*v)); v } )); } } @@ -2035,7 +2035,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results", "start-index"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "start-index"].iter().map(|v|*v)); v } )); } } diff --git a/gen/fusiontables2/src/api.rs b/gen/fusiontables2/src/api.rs index 85cee4ed87..03f6e74afb 100644 --- a/gen/fusiontables2/src/api.rs +++ b/gen/fusiontables2/src/api.rs @@ -1821,25 +1821,15 @@ impl<'a, C> ColumnDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1847,11 +1837,11 @@ impl<'a, C> ColumnDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -2084,25 +2074,15 @@ impl<'a, C> ColumnGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2110,13 +2090,15 @@ impl<'a, C> ColumnGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2374,25 +2356,15 @@ impl<'a, C> ColumnInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2400,13 +2372,15 @@ impl<'a, C> ColumnInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2652,25 +2626,15 @@ impl<'a, C> ColumnListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2678,13 +2642,15 @@ impl<'a, C> ColumnListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2948,25 +2914,15 @@ impl<'a, C> ColumnPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2974,13 +2930,15 @@ impl<'a, C> ColumnPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3249,25 +3207,15 @@ impl<'a, C> ColumnUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3275,13 +3223,15 @@ impl<'a, C> ColumnUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3544,25 +3494,15 @@ impl<'a, C> QuerySqlCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3570,19 +3510,21 @@ impl<'a, C> QuerySqlCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = if enable_resource_parsing { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); } } - } else { (reconstructed_result, Default::default()) }; + } else { (res, Default::default()) }; dlg.finished(true); return Ok(result_value) @@ -3837,25 +3779,15 @@ impl<'a, C> QuerySqlGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3863,19 +3795,21 @@ impl<'a, C> QuerySqlGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = if enable_resource_parsing { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); } } - } else { (reconstructed_result, Default::default()) }; + } else { (res, Default::default()) }; dlg.finished(true); return Ok(result_value) @@ -4114,25 +4048,15 @@ impl<'a, C> StyleDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4140,11 +4064,11 @@ impl<'a, C> StyleDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -4377,25 +4301,15 @@ impl<'a, C> StyleGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4403,13 +4317,15 @@ impl<'a, C> StyleGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4667,25 +4583,15 @@ impl<'a, C> StyleInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4693,13 +4599,15 @@ impl<'a, C> StyleInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4945,25 +4853,15 @@ impl<'a, C> StyleListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4971,13 +4869,15 @@ impl<'a, C> StyleListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5241,25 +5141,15 @@ impl<'a, C> StylePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5267,13 +5157,15 @@ impl<'a, C> StylePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5542,25 +5434,15 @@ impl<'a, C> StyleUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5568,13 +5450,15 @@ impl<'a, C> StyleUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5825,25 +5709,15 @@ impl<'a, C> TableCopyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5851,13 +5725,15 @@ impl<'a, C> TableCopyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6090,25 +5966,15 @@ impl<'a, C> TableDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6116,11 +5982,11 @@ impl<'a, C> TableDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -6341,25 +6207,15 @@ impl<'a, C> TableGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6367,13 +6223,15 @@ impl<'a, C> TableGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6665,25 +6523,15 @@ impl<'a, C> TableImportRowCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6691,7 +6539,7 @@ impl<'a, C> TableImportRowCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -6703,7 +6551,7 @@ impl<'a, C> TableImportRowCall<'a, C> where C: BorrowMut TableImportRowCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7059,25 +6909,15 @@ impl<'a, C> TableImportTableCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7085,7 +6925,7 @@ impl<'a, C> TableImportTableCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -7097,7 +6937,7 @@ impl<'a, C> TableImportTableCall<'a, C> where C: BorrowMut TableImportTableCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7401,25 +7243,15 @@ impl<'a, C> TableInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7427,13 +7259,15 @@ impl<'a, C> TableInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7646,25 +7480,15 @@ impl<'a, C> TableListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7672,13 +7496,15 @@ impl<'a, C> TableListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7935,25 +7761,15 @@ impl<'a, C> TablePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7961,13 +7777,15 @@ impl<'a, C> TablePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8210,25 +8028,15 @@ impl<'a, C> TableRefetchSheetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8236,13 +8044,15 @@ impl<'a, C> TableRefetchSheetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8534,25 +8344,15 @@ impl<'a, C> TableReplaceRowCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8560,7 +8360,7 @@ impl<'a, C> TableReplaceRowCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -8572,7 +8372,7 @@ impl<'a, C> TableReplaceRowCall<'a, C> where C: BorrowMut TableReplaceRowCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8925,25 +8727,15 @@ impl<'a, C> TableUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8951,13 +8743,15 @@ impl<'a, C> TableUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9201,25 +8995,15 @@ impl<'a, C> TaskDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9227,11 +9011,11 @@ impl<'a, C> TaskDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -9464,25 +9248,15 @@ impl<'a, C> TaskGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9490,13 +9264,15 @@ impl<'a, C> TaskGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9748,25 +9524,15 @@ impl<'a, C> TaskListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9774,13 +9540,15 @@ impl<'a, C> TaskListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10029,25 +9797,15 @@ impl<'a, C> TemplateDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10055,11 +9813,11 @@ impl<'a, C> TemplateDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -10292,25 +10050,15 @@ impl<'a, C> TemplateGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10318,13 +10066,15 @@ impl<'a, C> TemplateGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10582,25 +10332,15 @@ impl<'a, C> TemplateInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10608,13 +10348,15 @@ impl<'a, C> TemplateInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10860,25 +10602,15 @@ impl<'a, C> TemplateListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10886,13 +10618,15 @@ impl<'a, C> TemplateListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11156,25 +10890,15 @@ impl<'a, C> TemplatePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11182,13 +10906,15 @@ impl<'a, C> TemplatePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11457,25 +11183,15 @@ impl<'a, C> TemplateUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11483,13 +11199,15 @@ impl<'a, C> TemplateUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/fusiontables2/src/client.rs b/gen/fusiontables2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/fusiontables2/src/client.rs +++ b/gen/fusiontables2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/games1-cli/src/main.rs b/gen/games1-cli/src/main.rs index 0d9733e290..0a165681f0 100644 --- a/gen/games1-cli/src/main.rs +++ b/gen/games1-cli/src/main.rs @@ -70,7 +70,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "page-token", "language"].iter().map(|v|*v)); + v.extend(["language", "max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -493,7 +493,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["platform-type", "language"].iter().map(|v|*v)); + v.extend(["language", "platform-type"].iter().map(|v|*v)); v } )); } } @@ -710,7 +710,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "page-token", "language"].iter().map(|v|*v)); + v.extend(["language", "max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -772,7 +772,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "page-token", "language"].iter().map(|v|*v)); + v.extend(["language", "max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -981,7 +981,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "page-token", "language"].iter().map(|v|*v)); + v.extend(["language", "max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1095,7 +1095,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "page-token", "language"].iter().map(|v|*v)); + v.extend(["language", "max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1213,7 +1213,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "page-token", "language"].iter().map(|v|*v)); + v.extend(["language", "max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1330,7 +1330,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "include-rank-type", "page-token", "language"].iter().map(|v|*v)); + v.extend(["include-rank-type", "language", "max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1392,7 +1392,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "page-token", "language"].iter().map(|v|*v)); + v.extend(["language", "max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1460,7 +1460,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["results-above", "page-token", "max-results", "return-top-if-absent", "language"].iter().map(|v|*v)); + v.extend(["language", "max-results", "page-token", "results-above", "return-top-if-absent"].iter().map(|v|*v)); v } )); } } @@ -1519,7 +1519,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["score-tag", "language"].iter().map(|v|*v)); + v.extend(["language", "score-tag"].iter().map(|v|*v)); v } )); } } @@ -1726,7 +1726,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "page-token", "language"].iter().map(|v|*v)); + v.extend(["language", "max-results", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/games1/src/api.rs b/gen/games1/src/api.rs index 11655b3f8a..c7a66499cb 100644 --- a/gen/games1/src/api.rs +++ b/gen/games1/src/api.rs @@ -3103,25 +3103,15 @@ impl<'a, C> AchievementDefinitionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3129,13 +3119,15 @@ impl<'a, C> AchievementDefinitionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3384,25 +3376,15 @@ impl<'a, C> AchievementIncrementCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3410,13 +3392,15 @@ impl<'a, C> AchievementIncrementCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3684,25 +3668,15 @@ impl<'a, C> AchievementListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3710,13 +3684,15 @@ impl<'a, C> AchievementListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3975,25 +3951,15 @@ impl<'a, C> AchievementRevealCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4001,13 +3967,15 @@ impl<'a, C> AchievementRevealCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4240,25 +4208,15 @@ impl<'a, C> AchievementSetStepsAtLeastCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4266,13 +4224,15 @@ impl<'a, C> AchievementSetStepsAtLeastCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4513,25 +4473,15 @@ impl<'a, C> AchievementUnlockCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4539,13 +4489,15 @@ impl<'a, C> AchievementUnlockCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4774,25 +4726,15 @@ impl<'a, C> AchievementUpdateMultipleCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4800,13 +4742,15 @@ impl<'a, C> AchievementUpdateMultipleCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5046,25 +4990,15 @@ impl<'a, C> ApplicationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5072,13 +5006,15 @@ impl<'a, C> ApplicationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5310,25 +5246,15 @@ impl<'a, C> ApplicationGetEndPointCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5336,13 +5262,15 @@ impl<'a, C> ApplicationGetEndPointCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5553,25 +5481,15 @@ impl<'a, C> ApplicationPlayedCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5579,11 +5497,11 @@ impl<'a, C> ApplicationPlayedCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -5798,25 +5716,15 @@ impl<'a, C> ApplicationVerifyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5824,13 +5732,15 @@ impl<'a, C> ApplicationVerifyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6053,25 +5963,15 @@ impl<'a, C> EventListByPlayerCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6079,13 +5979,15 @@ impl<'a, C> EventListByPlayerCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6319,25 +6221,15 @@ impl<'a, C> EventListDefinitionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6345,13 +6237,15 @@ impl<'a, C> EventListDefinitionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6596,25 +6490,15 @@ impl<'a, C> EventRecordCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6622,13 +6506,15 @@ impl<'a, C> EventRecordCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6870,25 +6756,15 @@ impl<'a, C> LeaderboardGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6896,13 +6772,15 @@ impl<'a, C> LeaderboardGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7132,25 +7010,15 @@ impl<'a, C> LeaderboardListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7158,13 +7026,15 @@ impl<'a, C> LeaderboardListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7383,25 +7253,15 @@ impl<'a, C> MetagameGetMetagameConfigCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7409,13 +7269,15 @@ impl<'a, C> MetagameGetMetagameConfigCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7653,25 +7515,15 @@ impl<'a, C> MetagameListCategoriesByPlayerCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7679,13 +7531,15 @@ impl<'a, C> MetagameListCategoriesByPlayerCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7952,25 +7806,15 @@ impl<'a, C> PlayerGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7978,13 +7822,15 @@ impl<'a, C> PlayerGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8237,25 +8083,15 @@ impl<'a, C> PlayerListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8263,13 +8099,15 @@ impl<'a, C> PlayerListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8500,25 +8338,15 @@ impl<'a, C> RevisionCheckCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8526,13 +8354,15 @@ impl<'a, C> RevisionCheckCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8787,25 +8617,15 @@ impl<'a, C> ScoreGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8813,13 +8633,15 @@ impl<'a, C> ScoreGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9117,25 +8939,15 @@ impl<'a, C> ScoreListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9143,13 +8955,15 @@ impl<'a, C> ScoreListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9450,25 +9264,15 @@ impl<'a, C> ScoreListWindowCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9476,13 +9280,15 @@ impl<'a, C> ScoreListWindowCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9780,25 +9586,15 @@ impl<'a, C> ScoreSubmitCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9806,13 +9602,15 @@ impl<'a, C> ScoreSubmitCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10070,25 +9868,15 @@ impl<'a, C> ScoreSubmitMultipleCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10096,13 +9884,15 @@ impl<'a, C> ScoreSubmitMultipleCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10344,25 +10134,15 @@ impl<'a, C> SnapshotGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10370,13 +10150,15 @@ impl<'a, C> SnapshotGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10629,25 +10411,15 @@ impl<'a, C> SnapshotListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10655,13 +10427,15 @@ impl<'a, C> SnapshotListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10934,25 +10708,15 @@ impl<'a, C> SnapshotsExtendedResolveSnapshotHeadCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10960,13 +10724,15 @@ impl<'a, C> SnapshotsExtendedResolveSnapshotHeadCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11183,25 +10949,15 @@ impl<'a, C> StatGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11209,13 +10965,15 @@ impl<'a, C> StatGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/games1/src/client.rs b/gen/games1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/games1/src/client.rs +++ b/gen/games1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/gamesconfiguration1_configuration-cli/src/main.rs b/gen/gamesconfiguration1_configuration-cli/src/main.rs index e413caf386..7a8749f9de 100644 --- a/gen/gamesconfiguration1_configuration-cli/src/main.rs +++ b/gen/gamesconfiguration1_configuration-cli/src/main.rs @@ -265,7 +265,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -693,7 +693,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/gamesconfiguration1_configuration/src/api.rs b/gen/gamesconfiguration1_configuration/src/api.rs index 4a25aba51f..1f61051f3a 100644 --- a/gen/gamesconfiguration1_configuration/src/api.rs +++ b/gen/gamesconfiguration1_configuration/src/api.rs @@ -927,25 +927,15 @@ impl<'a, C> AchievementConfigurationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -953,11 +943,11 @@ impl<'a, C> AchievementConfigurationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -1182,25 +1172,15 @@ impl<'a, C> AchievementConfigurationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1208,13 +1188,15 @@ impl<'a, C> AchievementConfigurationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1466,25 +1448,15 @@ impl<'a, C> AchievementConfigurationInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1492,13 +1464,15 @@ impl<'a, C> AchievementConfigurationInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1748,25 +1722,15 @@ impl<'a, C> AchievementConfigurationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1774,13 +1738,15 @@ impl<'a, C> AchievementConfigurationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2046,25 +2012,15 @@ impl<'a, C> AchievementConfigurationUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2072,13 +2028,15 @@ impl<'a, C> AchievementConfigurationUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2340,25 +2298,15 @@ impl<'a, C> ImageConfigurationUploadCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2366,13 +2314,15 @@ impl<'a, C> ImageConfigurationUploadCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2622,25 +2572,15 @@ impl<'a, C> LeaderboardConfigurationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2648,11 +2588,11 @@ impl<'a, C> LeaderboardConfigurationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -2877,25 +2817,15 @@ impl<'a, C> LeaderboardConfigurationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2903,13 +2833,15 @@ impl<'a, C> LeaderboardConfigurationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3161,25 +3093,15 @@ impl<'a, C> LeaderboardConfigurationInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3187,13 +3109,15 @@ impl<'a, C> LeaderboardConfigurationInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3443,25 +3367,15 @@ impl<'a, C> LeaderboardConfigurationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3469,13 +3383,15 @@ impl<'a, C> LeaderboardConfigurationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3741,25 +3657,15 @@ impl<'a, C> LeaderboardConfigurationUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3767,13 +3673,15 @@ impl<'a, C> LeaderboardConfigurationUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/gamesconfiguration1_configuration/src/client.rs b/gen/gamesconfiguration1_configuration/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/gamesconfiguration1_configuration/src/client.rs +++ b/gen/gamesconfiguration1_configuration/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/gameservices1-cli/src/main.rs b/gen/gameservices1-cli/src/main.rs index 25f681a09b..13c766b06a 100644 --- a/gen/gameservices1-cli/src/main.rs +++ b/gen/gameservices1-cli/src/main.rs @@ -270,7 +270,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["order-by", "page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -725,7 +725,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["order-by", "page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1298,7 +1298,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["include-unrevealed-locations", "page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "include-unrevealed-locations", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1548,7 +1548,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1960,7 +1960,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["order-by", "page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2155,7 +2155,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["preview-time", "game-server-cluster-id"].iter().map(|v|*v)); + v.extend(["game-server-cluster-id", "preview-time"].iter().map(|v|*v)); v } )); } } @@ -2427,7 +2427,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["order-by", "page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/gameservices1/src/api.rs b/gen/gameservices1/src/api.rs index 603c764dd7..676dc42aa4 100644 --- a/gen/gameservices1/src/api.rs +++ b/gen/gameservices1/src/api.rs @@ -2280,25 +2280,15 @@ impl<'a, C> ProjectLocationGameServerDeploymentConfigCreateCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2306,13 +2296,15 @@ impl<'a, C> ProjectLocationGameServerDeploymentConfigCreateCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2563,25 +2555,15 @@ impl<'a, C> ProjectLocationGameServerDeploymentConfigDeleteCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2589,13 +2571,15 @@ impl<'a, C> ProjectLocationGameServerDeploymentConfigDeleteCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2830,25 +2814,15 @@ impl<'a, C> ProjectLocationGameServerDeploymentConfigGetCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2856,13 +2830,15 @@ impl<'a, C> ProjectLocationGameServerDeploymentConfigGetCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3117,25 +3093,15 @@ impl<'a, C> ProjectLocationGameServerDeploymentConfigListCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3143,13 +3109,15 @@ impl<'a, C> ProjectLocationGameServerDeploymentConfigListCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3438,25 +3406,15 @@ impl<'a, C> ProjectLocationGameServerDeploymentCreateCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3464,13 +3422,15 @@ impl<'a, C> ProjectLocationGameServerDeploymentCreateCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3721,25 +3681,15 @@ impl<'a, C> ProjectLocationGameServerDeploymentDeleteCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3747,13 +3697,15 @@ impl<'a, C> ProjectLocationGameServerDeploymentDeleteCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4009,25 +3961,15 @@ impl<'a, C> ProjectLocationGameServerDeploymentFetchDeploymentStateCall<'a, C> w return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4035,13 +3977,15 @@ impl<'a, C> ProjectLocationGameServerDeploymentFetchDeploymentStateCall<'a, C> w } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4285,25 +4229,15 @@ impl<'a, C> ProjectLocationGameServerDeploymentGetCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4311,13 +4245,15 @@ impl<'a, C> ProjectLocationGameServerDeploymentGetCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4557,25 +4493,15 @@ impl<'a, C> ProjectLocationGameServerDeploymentGetIamPolicyCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4583,13 +4509,15 @@ impl<'a, C> ProjectLocationGameServerDeploymentGetIamPolicyCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4831,25 +4759,15 @@ impl<'a, C> ProjectLocationGameServerDeploymentGetRolloutCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4857,13 +4775,15 @@ impl<'a, C> ProjectLocationGameServerDeploymentGetRolloutCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5118,25 +5038,15 @@ impl<'a, C> ProjectLocationGameServerDeploymentListCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5144,13 +5054,15 @@ impl<'a, C> ProjectLocationGameServerDeploymentListCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5439,25 +5351,15 @@ impl<'a, C> ProjectLocationGameServerDeploymentPatchCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5465,13 +5367,15 @@ impl<'a, C> ProjectLocationGameServerDeploymentPatchCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5753,25 +5657,15 @@ impl<'a, C> ProjectLocationGameServerDeploymentPreviewRolloutCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5779,13 +5673,15 @@ impl<'a, C> ProjectLocationGameServerDeploymentPreviewRolloutCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6064,25 +5960,15 @@ impl<'a, C> ProjectLocationGameServerDeploymentSetIamPolicyCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6090,13 +5976,15 @@ impl<'a, C> ProjectLocationGameServerDeploymentSetIamPolicyCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6361,25 +6249,15 @@ impl<'a, C> ProjectLocationGameServerDeploymentTestIamPermissionCall<'a, C> wher return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6387,13 +6265,15 @@ impl<'a, C> ProjectLocationGameServerDeploymentTestIamPermissionCall<'a, C> wher } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6663,25 +6543,15 @@ impl<'a, C> ProjectLocationGameServerDeploymentUpdateRolloutCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6689,13 +6559,15 @@ impl<'a, C> ProjectLocationGameServerDeploymentUpdateRolloutCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6967,25 +6839,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6993,13 +6855,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7243,25 +7107,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7269,13 +7123,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7510,25 +7366,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7536,13 +7382,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7792,25 +7640,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7818,13 +7656,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8106,25 +7946,15 @@ impl<'a, C> ProjectLocationRealmGameServerClusterCreateCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8132,13 +7962,15 @@ impl<'a, C> ProjectLocationRealmGameServerClusterCreateCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8389,25 +8221,15 @@ impl<'a, C> ProjectLocationRealmGameServerClusterDeleteCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8415,13 +8237,15 @@ impl<'a, C> ProjectLocationRealmGameServerClusterDeleteCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8656,25 +8480,15 @@ impl<'a, C> ProjectLocationRealmGameServerClusterGetCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8682,13 +8496,15 @@ impl<'a, C> ProjectLocationRealmGameServerClusterGetCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8943,25 +8759,15 @@ impl<'a, C> ProjectLocationRealmGameServerClusterListCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8969,13 +8775,15 @@ impl<'a, C> ProjectLocationRealmGameServerClusterListCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9264,25 +9072,15 @@ impl<'a, C> ProjectLocationRealmGameServerClusterPatchCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9290,13 +9088,15 @@ impl<'a, C> ProjectLocationRealmGameServerClusterPatchCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9578,25 +9378,15 @@ impl<'a, C> ProjectLocationRealmGameServerClusterPreviewCreateCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9604,13 +9394,15 @@ impl<'a, C> ProjectLocationRealmGameServerClusterPreviewCreateCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9873,25 +9665,15 @@ impl<'a, C> ProjectLocationRealmGameServerClusterPreviewDeleteCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9899,13 +9681,15 @@ impl<'a, C> ProjectLocationRealmGameServerClusterPreviewDeleteCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10178,25 +9962,15 @@ impl<'a, C> ProjectLocationRealmGameServerClusterPreviewUpdateCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10204,13 +9978,15 @@ impl<'a, C> ProjectLocationRealmGameServerClusterPreviewUpdateCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10494,25 +10270,15 @@ impl<'a, C> ProjectLocationRealmCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10520,13 +10286,15 @@ impl<'a, C> ProjectLocationRealmCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10777,25 +10545,15 @@ impl<'a, C> ProjectLocationRealmDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10803,13 +10561,15 @@ impl<'a, C> ProjectLocationRealmDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11044,25 +10804,15 @@ impl<'a, C> ProjectLocationRealmGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11070,13 +10820,15 @@ impl<'a, C> ProjectLocationRealmGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11331,25 +11083,15 @@ impl<'a, C> ProjectLocationRealmListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11357,13 +11099,15 @@ impl<'a, C> ProjectLocationRealmListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11652,25 +11396,15 @@ impl<'a, C> ProjectLocationRealmPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11678,13 +11412,15 @@ impl<'a, C> ProjectLocationRealmPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11966,25 +11702,15 @@ impl<'a, C> ProjectLocationRealmPreviewUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11992,13 +11718,15 @@ impl<'a, C> ProjectLocationRealmPreviewUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12256,25 +11984,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12282,13 +12000,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12543,25 +12263,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12569,13 +12279,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/gameservices1/src/client.rs b/gen/gameservices1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/gameservices1/src/client.rs +++ b/gen/gameservices1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/gamesmanagement1_management-cli/src/main.rs b/gen/gamesmanagement1_management-cli/src/main.rs index d6b12e567a..58a82cbe8a 100644 --- a/gen/gamesmanagement1_management-cli/src/main.rs +++ b/gen/gamesmanagement1_management-cli/src/main.rs @@ -337,7 +337,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/gamesmanagement1_management/src/api.rs b/gen/gamesmanagement1_management/src/api.rs index d1b4ffd151..9a8d1903e0 100644 --- a/gen/gamesmanagement1_management/src/api.rs +++ b/gen/gamesmanagement1_management/src/api.rs @@ -1132,25 +1132,15 @@ impl<'a, C> AchievementResetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1158,13 +1148,15 @@ impl<'a, C> AchievementResetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1372,25 +1364,15 @@ impl<'a, C> AchievementResetAllCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1398,13 +1380,15 @@ impl<'a, C> AchievementResetAllCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1601,25 +1585,15 @@ impl<'a, C> AchievementResetAllForAllPlayerCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1627,11 +1601,11 @@ impl<'a, C> AchievementResetAllForAllPlayerCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -1845,25 +1819,15 @@ impl<'a, C> AchievementResetForAllPlayerCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1871,11 +1835,11 @@ impl<'a, C> AchievementResetForAllPlayerCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -2097,25 +2061,15 @@ impl<'a, C> AchievementResetMultipleForAllPlayerCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2123,11 +2077,11 @@ impl<'a, C> AchievementResetMultipleForAllPlayerCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -2361,25 +2315,15 @@ impl<'a, C> ApplicationListHiddenCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2387,13 +2331,15 @@ impl<'a, C> ApplicationListHiddenCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2637,25 +2583,15 @@ impl<'a, C> EventResetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2663,11 +2599,11 @@ impl<'a, C> EventResetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -2868,25 +2804,15 @@ impl<'a, C> EventResetAllCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2894,11 +2820,11 @@ impl<'a, C> EventResetAllCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -3089,25 +3015,15 @@ impl<'a, C> EventResetAllForAllPlayerCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3115,11 +3031,11 @@ impl<'a, C> EventResetAllForAllPlayerCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -3333,25 +3249,15 @@ impl<'a, C> EventResetForAllPlayerCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3359,11 +3265,11 @@ impl<'a, C> EventResetForAllPlayerCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -3585,25 +3491,15 @@ impl<'a, C> EventResetMultipleForAllPlayerCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3611,11 +3507,11 @@ impl<'a, C> EventResetMultipleForAllPlayerCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -3840,25 +3736,15 @@ impl<'a, C> PlayerHideCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3866,11 +3752,11 @@ impl<'a, C> PlayerHideCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -4106,25 +3992,15 @@ impl<'a, C> PlayerUnhideCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4132,11 +4008,11 @@ impl<'a, C> PlayerUnhideCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -4371,25 +4247,15 @@ impl<'a, C> ScoreResetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4397,13 +4263,15 @@ impl<'a, C> ScoreResetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4611,25 +4479,15 @@ impl<'a, C> ScoreResetAllCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4637,13 +4495,15 @@ impl<'a, C> ScoreResetAllCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4840,25 +4700,15 @@ impl<'a, C> ScoreResetAllForAllPlayerCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4866,11 +4716,11 @@ impl<'a, C> ScoreResetAllForAllPlayerCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -5084,25 +4934,15 @@ impl<'a, C> ScoreResetForAllPlayerCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5110,11 +4950,11 @@ impl<'a, C> ScoreResetForAllPlayerCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -5336,25 +5176,15 @@ impl<'a, C> ScoreResetMultipleForAllPlayerCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5362,11 +5192,11 @@ impl<'a, C> ScoreResetMultipleForAllPlayerCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) diff --git a/gen/gamesmanagement1_management/src/client.rs b/gen/gamesmanagement1_management/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/gamesmanagement1_management/src/client.rs +++ b/gen/gamesmanagement1_management/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/gan1_beta1-cli/src/main.rs b/gen/gan1_beta1-cli/src/main.rs index a5370f32c9..d9c55d0e50 100644 --- a/gen/gan1_beta1-cli/src/main.rs +++ b/gen/gan1_beta1-cli/src/main.rs @@ -135,7 +135,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["advertiser-category", "min-payout-rank", "relationship-status", "page-token", "min-seven-day-epc", "min-ninety-day-epc", "max-results"].iter().map(|v|*v)); + v.extend(["advertiser-category", "max-results", "min-ninety-day-epc", "min-payout-rank", "min-seven-day-epc", "page-token", "relationship-status"].iter().map(|v|*v)); v } )); } } @@ -289,7 +289,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["order-id", "sku", "page-token", "max-results", "link-id", "member-id", "status", "modify-date-max", "event-date-max", "charge-type", "publisher-id", "modify-date-min", "advertiser-id", "type", "event-date-min", "product-category"].iter().map(|v|*v)); + v.extend(["advertiser-id", "charge-type", "event-date-max", "event-date-min", "link-id", "max-results", "member-id", "modify-date-max", "modify-date-min", "order-id", "page-token", "product-category", "publisher-id", "sku", "status", "type"].iter().map(|v|*v)); v } )); } } @@ -542,7 +542,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["asset-size", "start-date-max", "search-text", "promotion-type", "authorship", "relationship-status", "page-token", "start-date-min", "max-results", "create-date-min", "link-type", "advertiser-id", "create-date-max"].iter().map(|v|*v)); + v.extend(["advertiser-id", "asset-size", "authorship", "create-date-max", "create-date-min", "link-type", "max-results", "page-token", "promotion-type", "relationship-status", "search-text", "start-date-max", "start-date-min"].iter().map(|v|*v)); v } )); } } @@ -666,7 +666,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["publisher-category", "min-payout-rank", "relationship-status", "page-token", "min-seven-day-epc", "min-ninety-day-epc", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "min-ninety-day-epc", "min-payout-rank", "min-seven-day-epc", "page-token", "publisher-category", "relationship-status"].iter().map(|v|*v)); v } )); } } @@ -749,7 +749,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["order-id", "start-index", "calculate-totals", "start-date", "link-id", "max-results", "end-date", "status", "event-type", "advertiser-id", "publisher-id"].iter().map(|v|*v)); + v.extend(["advertiser-id", "calculate-totals", "end-date", "event-type", "link-id", "max-results", "order-id", "publisher-id", "start-date", "start-index", "status"].iter().map(|v|*v)); v } )); } } diff --git a/gen/gan1_beta1/src/api.rs b/gen/gan1_beta1/src/api.rs index d92002b637..7147727e2b 100644 --- a/gen/gan1_beta1/src/api.rs +++ b/gen/gan1_beta1/src/api.rs @@ -1574,25 +1574,15 @@ impl<'a, C> AdvertiserGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1600,13 +1590,15 @@ impl<'a, C> AdvertiserGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1856,25 +1848,15 @@ impl<'a, C> AdvertiserListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1882,13 +1864,15 @@ impl<'a, C> AdvertiserListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2155,25 +2139,15 @@ impl<'a, C> CcOfferListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2181,13 +2155,15 @@ impl<'a, C> CcOfferListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2480,25 +2456,15 @@ impl<'a, C> EventListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2506,13 +2472,15 @@ impl<'a, C> EventListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2834,25 +2802,15 @@ impl<'a, C> LinkGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2860,13 +2818,15 @@ impl<'a, C> LinkGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3105,25 +3065,15 @@ impl<'a, C> LinkInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3131,13 +3081,15 @@ impl<'a, C> LinkInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3425,25 +3377,15 @@ impl<'a, C> LinkListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3451,13 +3393,15 @@ impl<'a, C> LinkListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3764,25 +3708,15 @@ impl<'a, C> PublisherGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3790,13 +3724,15 @@ impl<'a, C> PublisherGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4046,25 +3982,15 @@ impl<'a, C> PublisherListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4072,13 +3998,15 @@ impl<'a, C> PublisherListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4400,25 +4328,15 @@ impl<'a, C> ReportGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4426,13 +4344,15 @@ impl<'a, C> ReportGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/gan1_beta1/src/client.rs b/gen/gan1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/gan1_beta1/src/client.rs +++ b/gen/gan1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/genomics1-cli/src/main.rs b/gen/genomics1-cli/src/main.rs index b76cc81e98..22751733e0 100644 --- a/gen/genomics1-cli/src/main.rs +++ b/gen/genomics1-cli/src/main.rs @@ -206,7 +206,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/genomics1/src/api.rs b/gen/genomics1/src/api.rs index b26197b1a6..5bc951f35f 100644 --- a/gen/genomics1/src/api.rs +++ b/gen/genomics1/src/api.rs @@ -536,25 +536,15 @@ impl<'a, C> OperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -562,13 +552,15 @@ impl<'a, C> OperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -812,25 +804,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -838,13 +820,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1094,25 +1078,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1120,13 +1094,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/genomics1/src/client.rs b/gen/genomics1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/genomics1/src/client.rs +++ b/gen/genomics1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/gkehub1-cli/src/main.rs b/gen/gkehub1-cli/src/main.rs index d4ff959d5c..07f8b0936d 100644 --- a/gen/gkehub1-cli/src/main.rs +++ b/gen/gkehub1-cli/src/main.rs @@ -233,7 +233,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["request-id", "membership-id"].iter().map(|v|*v)); + v.extend(["membership-id", "request-id"].iter().map(|v|*v)); v } )); } } @@ -360,7 +360,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["version", "proxy", "namespace", "is-upgrade", "registry", "image-pull-secret-content"].iter().map(|v|*v)); + v.extend(["image-pull-secret-content", "is-upgrade", "namespace", "proxy", "registry", "version"].iter().map(|v|*v)); v } )); } } @@ -644,7 +644,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["update-mask", "request-id"].iter().map(|v|*v)); + v.extend(["request-id", "update-mask"].iter().map(|v|*v)); v } )); } } diff --git a/gen/gkehub1/src/api.rs b/gen/gkehub1/src/api.rs index b62326511e..533ff1708f 100644 --- a/gen/gkehub1/src/api.rs +++ b/gen/gkehub1/src/api.rs @@ -1194,25 +1194,15 @@ impl<'a, C> ProjectLocationMembershipCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1220,13 +1210,15 @@ impl<'a, C> ProjectLocationMembershipCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1489,25 +1481,15 @@ impl<'a, C> ProjectLocationMembershipDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1515,13 +1497,15 @@ impl<'a, C> ProjectLocationMembershipDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1793,25 +1777,15 @@ impl<'a, C> ProjectLocationMembershipGenerateConnectManifestCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1819,13 +1793,15 @@ impl<'a, C> ProjectLocationMembershipGenerateConnectManifestCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2102,25 +2078,15 @@ impl<'a, C> ProjectLocationMembershipGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2128,13 +2094,15 @@ impl<'a, C> ProjectLocationMembershipGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2374,25 +2342,15 @@ impl<'a, C> ProjectLocationMembershipGetIamPolicyCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2400,13 +2358,15 @@ impl<'a, C> ProjectLocationMembershipGetIamPolicyCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2668,25 +2628,15 @@ impl<'a, C> ProjectLocationMembershipListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2694,13 +2644,15 @@ impl<'a, C> ProjectLocationMembershipListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2994,25 +2946,15 @@ impl<'a, C> ProjectLocationMembershipPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3020,13 +2962,15 @@ impl<'a, C> ProjectLocationMembershipPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3305,25 +3249,15 @@ impl<'a, C> ProjectLocationMembershipSetIamPolicyCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3331,13 +3265,15 @@ impl<'a, C> ProjectLocationMembershipSetIamPolicyCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3602,25 +3538,15 @@ impl<'a, C> ProjectLocationMembershipTestIamPermissionCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3628,13 +3554,15 @@ impl<'a, C> ProjectLocationMembershipTestIamPermissionCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3899,25 +3827,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3925,13 +3843,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4175,25 +4095,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4201,13 +4111,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4442,25 +4354,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4468,13 +4370,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4724,25 +4628,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4750,13 +4644,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5012,25 +4908,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5038,13 +4924,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5294,25 +5182,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5320,13 +5198,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/gkehub1/src/client.rs b/gen/gkehub1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/gkehub1/src/client.rs +++ b/gen/gkehub1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/gmail1-cli/src/main.rs b/gen/gmail1-cli/src/main.rs index b3ad81c2b8..8f0b34dc07 100644 --- a/gen/gmail1-cli/src/main.rs +++ b/gen/gmail1-cli/src/main.rs @@ -275,7 +275,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["include-spam-trash", "page-token", "max-results", "q"].iter().map(|v|*v)); + v.extend(["include-spam-trash", "max-results", "page-token", "q"].iter().map(|v|*v)); v } )); } } @@ -599,7 +599,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-history-id", "max-results", "history-types", "label-id", "page-token"].iter().map(|v|*v)); + v.extend(["history-types", "label-id", "max-results", "page-token", "start-history-id"].iter().map(|v|*v)); v } )); } } @@ -1454,7 +1454,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["process-for-calendar", "never-mark-spam", "internal-date-source", "deleted"].iter().map(|v|*v)); + v.extend(["deleted", "internal-date-source", "never-mark-spam", "process-for-calendar"].iter().map(|v|*v)); v } )); } } @@ -1562,7 +1562,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["internal-date-source", "deleted"].iter().map(|v|*v)); + v.extend(["deleted", "internal-date-source"].iter().map(|v|*v)); v } )); } } @@ -1633,7 +1633,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["label-ids", "include-spam-trash", "q", "max-results", "page-token"].iter().map(|v|*v)); + v.extend(["include-spam-trash", "label-ids", "max-results", "page-token", "q"].iter().map(|v|*v)); v } )); } } @@ -4316,7 +4316,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["label-ids", "include-spam-trash", "q", "max-results", "page-token"].iter().map(|v|*v)); + v.extend(["include-spam-trash", "label-ids", "max-results", "page-token", "q"].iter().map(|v|*v)); v } )); } } diff --git a/gen/gmail1/src/api.rs b/gen/gmail1/src/api.rs index cd22b9d1f3..fa7efe49c8 100644 --- a/gen/gmail1/src/api.rs +++ b/gen/gmail1/src/api.rs @@ -2839,25 +2839,15 @@ impl<'a, C> UserDraftCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2865,7 +2855,7 @@ impl<'a, C> UserDraftCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -2877,7 +2867,7 @@ impl<'a, C> UserDraftCreateCall<'a, C> where C: BorrowMut UserDraftCreateCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3183,25 +3175,15 @@ impl<'a, C> UserDraftDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3209,11 +3191,11 @@ impl<'a, C> UserDraftDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -3455,25 +3437,15 @@ impl<'a, C> UserDraftGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3481,13 +3453,15 @@ impl<'a, C> UserDraftGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3755,25 +3729,15 @@ impl<'a, C> UserDraftListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3781,13 +3745,15 @@ impl<'a, C> UserDraftListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4112,25 +4078,15 @@ impl<'a, C> UserDraftSendCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4138,7 +4094,7 @@ impl<'a, C> UserDraftSendCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -4150,7 +4106,7 @@ impl<'a, C> UserDraftSendCall<'a, C> where C: BorrowMut UserDraftSendCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4523,25 +4481,15 @@ impl<'a, C> UserDraftUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4549,7 +4497,7 @@ impl<'a, C> UserDraftUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -4561,7 +4509,7 @@ impl<'a, C> UserDraftUpdateCall<'a, C> where C: BorrowMut UserDraftUpdateCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4903,25 +4853,15 @@ impl<'a, C> UserHistoryListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4929,13 +4869,15 @@ impl<'a, C> UserHistoryListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5223,25 +5165,15 @@ impl<'a, C> UserLabelCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5249,13 +5181,15 @@ impl<'a, C> UserLabelCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5496,25 +5430,15 @@ impl<'a, C> UserLabelDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5522,11 +5446,11 @@ impl<'a, C> UserLabelDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -5763,25 +5687,15 @@ impl<'a, C> UserLabelGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5789,13 +5703,15 @@ impl<'a, C> UserLabelGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6036,25 +5952,15 @@ impl<'a, C> UserLabelListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6062,13 +5968,15 @@ impl<'a, C> UserLabelListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6322,25 +6230,15 @@ impl<'a, C> UserLabelPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6348,13 +6246,15 @@ impl<'a, C> UserLabelPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6627,25 +6527,15 @@ impl<'a, C> UserLabelUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6653,13 +6543,15 @@ impl<'a, C> UserLabelUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6913,25 +6805,15 @@ impl<'a, C> UserMessageAttachmentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6939,13 +6821,15 @@ impl<'a, C> UserMessageAttachmentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7216,25 +7100,15 @@ impl<'a, C> UserMessageBatchDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7242,11 +7116,11 @@ impl<'a, C> UserMessageBatchDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -7500,25 +7374,15 @@ impl<'a, C> UserMessageBatchModifyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7526,11 +7390,11 @@ impl<'a, C> UserMessageBatchModifyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -7765,25 +7629,15 @@ impl<'a, C> UserMessageDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7791,11 +7645,11 @@ impl<'a, C> UserMessageDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -8044,25 +7898,15 @@ impl<'a, C> UserMessageGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8070,13 +7914,15 @@ impl<'a, C> UserMessageGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8418,25 +8264,15 @@ impl<'a, C> UserMessageImportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8444,7 +8280,7 @@ impl<'a, C> UserMessageImportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -8456,7 +8292,7 @@ impl<'a, C> UserMessageImportCall<'a, C> where C: BorrowMut UserMessageImportCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8865,25 +8703,15 @@ impl<'a, C> UserMessageInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8891,7 +8719,7 @@ impl<'a, C> UserMessageInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -8903,7 +8731,7 @@ impl<'a, C> UserMessageInsertCall<'a, C> where C: BorrowMut UserMessageInsertCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9249,25 +9079,15 @@ impl<'a, C> UserMessageListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9275,13 +9095,15 @@ impl<'a, C> UserMessageListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9571,25 +9393,15 @@ impl<'a, C> UserMessageModifyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9597,13 +9409,15 @@ impl<'a, C> UserMessageModifyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9919,25 +9733,15 @@ impl<'a, C> UserMessageSendCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9945,7 +9749,7 @@ impl<'a, C> UserMessageSendCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -9957,7 +9761,7 @@ impl<'a, C> UserMessageSendCall<'a, C> where C: BorrowMut UserMessageSendCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10264,25 +10070,15 @@ impl<'a, C> UserMessageTrashCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10290,13 +10086,15 @@ impl<'a, C> UserMessageTrashCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10539,25 +10337,15 @@ impl<'a, C> UserMessageUntrashCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10565,13 +10353,15 @@ impl<'a, C> UserMessageUntrashCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10833,25 +10623,15 @@ impl<'a, C> UserSettingDelegateCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10859,13 +10639,15 @@ impl<'a, C> UserSettingDelegateCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11106,25 +10888,15 @@ impl<'a, C> UserSettingDelegateDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11132,11 +10904,11 @@ impl<'a, C> UserSettingDelegateDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -11373,25 +11145,15 @@ impl<'a, C> UserSettingDelegateGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11399,13 +11161,15 @@ impl<'a, C> UserSettingDelegateGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11646,25 +11410,15 @@ impl<'a, C> UserSettingDelegateListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11672,13 +11426,15 @@ impl<'a, C> UserSettingDelegateListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11930,25 +11686,15 @@ impl<'a, C> UserSettingFilterCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11956,13 +11702,15 @@ impl<'a, C> UserSettingFilterCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12203,25 +11951,15 @@ impl<'a, C> UserSettingFilterDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12229,11 +11967,11 @@ impl<'a, C> UserSettingFilterDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -12470,25 +12208,15 @@ impl<'a, C> UserSettingFilterGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12496,13 +12224,15 @@ impl<'a, C> UserSettingFilterGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12743,25 +12473,15 @@ impl<'a, C> UserSettingFilterListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12769,13 +12489,15 @@ impl<'a, C> UserSettingFilterListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13027,25 +12749,15 @@ impl<'a, C> UserSettingForwardingAddresseCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13053,13 +12765,15 @@ impl<'a, C> UserSettingForwardingAddresseCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13300,25 +13014,15 @@ impl<'a, C> UserSettingForwardingAddresseDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13326,11 +13030,11 @@ impl<'a, C> UserSettingForwardingAddresseDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -13567,25 +13271,15 @@ impl<'a, C> UserSettingForwardingAddresseGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13593,13 +13287,15 @@ impl<'a, C> UserSettingForwardingAddresseGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13840,25 +13536,15 @@ impl<'a, C> UserSettingForwardingAddresseListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13866,13 +13552,15 @@ impl<'a, C> UserSettingForwardingAddresseListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14106,25 +13794,15 @@ impl<'a, C> UserSettingSendASmimeInfoDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14132,11 +13810,11 @@ impl<'a, C> UserSettingSendASmimeInfoDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -14385,25 +14063,15 @@ impl<'a, C> UserSettingSendASmimeInfoGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14411,13 +14079,15 @@ impl<'a, C> UserSettingSendASmimeInfoGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14691,25 +14361,15 @@ impl<'a, C> UserSettingSendASmimeInfoInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14717,13 +14377,15 @@ impl<'a, C> UserSettingSendASmimeInfoInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14975,25 +14637,15 @@ impl<'a, C> UserSettingSendASmimeInfoListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15001,13 +14653,15 @@ impl<'a, C> UserSettingSendASmimeInfoListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15251,25 +14905,15 @@ impl<'a, C> UserSettingSendASmimeInfoSetDefaultCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15277,11 +14921,11 @@ impl<'a, C> UserSettingSendASmimeInfoSetDefaultCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -15547,25 +15191,15 @@ impl<'a, C> UserSettingSendACreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15573,13 +15207,15 @@ impl<'a, C> UserSettingSendACreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15820,25 +15456,15 @@ impl<'a, C> UserSettingSendADeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15846,11 +15472,11 @@ impl<'a, C> UserSettingSendADeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -16087,25 +15713,15 @@ impl<'a, C> UserSettingSendAGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16113,13 +15729,15 @@ impl<'a, C> UserSettingSendAGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16360,25 +15978,15 @@ impl<'a, C> UserSettingSendAListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16386,13 +15994,15 @@ impl<'a, C> UserSettingSendAListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16646,25 +16256,15 @@ impl<'a, C> UserSettingSendAPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16672,13 +16272,15 @@ impl<'a, C> UserSettingSendAPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16951,25 +16553,15 @@ impl<'a, C> UserSettingSendAUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16977,13 +16569,15 @@ impl<'a, C> UserSettingSendAUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17234,25 +16828,15 @@ impl<'a, C> UserSettingSendAVerifyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17260,11 +16844,11 @@ impl<'a, C> UserSettingSendAVerifyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -17499,25 +17083,15 @@ impl<'a, C> UserSettingGetAutoForwardingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17525,13 +17099,15 @@ impl<'a, C> UserSettingGetAutoForwardingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17762,25 +17338,15 @@ impl<'a, C> UserSettingGetImapCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17788,13 +17354,15 @@ impl<'a, C> UserSettingGetImapCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18025,25 +17593,15 @@ impl<'a, C> UserSettingGetLanguageCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18051,13 +17609,15 @@ impl<'a, C> UserSettingGetLanguageCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18288,25 +17848,15 @@ impl<'a, C> UserSettingGetPopCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18314,13 +17864,15 @@ impl<'a, C> UserSettingGetPopCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18551,25 +18103,15 @@ impl<'a, C> UserSettingGetVacationCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18577,13 +18119,15 @@ impl<'a, C> UserSettingGetVacationCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18835,25 +18379,15 @@ impl<'a, C> UserSettingUpdateAutoForwardingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18861,13 +18395,15 @@ impl<'a, C> UserSettingUpdateAutoForwardingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19128,25 +18664,15 @@ impl<'a, C> UserSettingUpdateImapCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19154,13 +18680,15 @@ impl<'a, C> UserSettingUpdateImapCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19421,25 +18949,15 @@ impl<'a, C> UserSettingUpdateLanguageCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19447,13 +18965,15 @@ impl<'a, C> UserSettingUpdateLanguageCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19714,25 +19234,15 @@ impl<'a, C> UserSettingUpdatePopCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19740,13 +19250,15 @@ impl<'a, C> UserSettingUpdatePopCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20007,25 +19519,15 @@ impl<'a, C> UserSettingUpdateVacationCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20033,13 +19535,15 @@ impl<'a, C> UserSettingUpdateVacationCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20280,25 +19784,15 @@ impl<'a, C> UserThreadDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20306,11 +19800,11 @@ impl<'a, C> UserThreadDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -20559,25 +20053,15 @@ impl<'a, C> UserThreadGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20585,13 +20069,15 @@ impl<'a, C> UserThreadGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20874,25 +20360,15 @@ impl<'a, C> UserThreadListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20900,13 +20376,15 @@ impl<'a, C> UserThreadListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21196,25 +20674,15 @@ impl<'a, C> UserThreadModifyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21222,13 +20690,15 @@ impl<'a, C> UserThreadModifyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21480,25 +20950,15 @@ impl<'a, C> UserThreadTrashCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21506,13 +20966,15 @@ impl<'a, C> UserThreadTrashCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21755,25 +21217,15 @@ impl<'a, C> UserThreadUntrashCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21781,13 +21233,15 @@ impl<'a, C> UserThreadUntrashCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22028,25 +21482,15 @@ impl<'a, C> UserGetProfileCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22054,13 +21498,15 @@ impl<'a, C> UserGetProfileCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22290,25 +21736,15 @@ impl<'a, C> UserStopCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22316,11 +21752,11 @@ impl<'a, C> UserStopCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -22566,25 +22002,15 @@ impl<'a, C> UserWatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22592,13 +22018,15 @@ impl<'a, C> UserWatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/gmail1/src/client.rs b/gen/gmail1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/gmail1/src/client.rs +++ b/gen/gmail1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/gmailpostmastertools1-cli/src/main.rs b/gen/gmailpostmastertools1-cli/src/main.rs index d0bc19cc1e..0877b1931b 100644 --- a/gen/gmailpostmastertools1-cli/src/main.rs +++ b/gen/gmailpostmastertools1-cli/src/main.rs @@ -248,7 +248,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-date-year", "page-size", "end-date-year", "page-token", "end-date-month", "end-date-day", "start-date-day", "start-date-month"].iter().map(|v|*v)); + v.extend(["end-date-day", "end-date-month", "end-date-year", "page-size", "page-token", "start-date-day", "start-date-month", "start-date-year"].iter().map(|v|*v)); v } )); } } diff --git a/gen/gmailpostmastertools1/src/api.rs b/gen/gmailpostmastertools1/src/api.rs index 7e4611f09b..2436f2d66c 100644 --- a/gen/gmailpostmastertools1/src/api.rs +++ b/gen/gmailpostmastertools1/src/api.rs @@ -609,25 +609,15 @@ impl<'a, C> DomainTrafficStatGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -635,13 +625,15 @@ impl<'a, C> DomainTrafficStatGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -916,25 +908,15 @@ impl<'a, C> DomainTrafficStatListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -942,13 +924,15 @@ impl<'a, C> DomainTrafficStatListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1239,25 +1223,15 @@ impl<'a, C> DomainGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1265,13 +1239,15 @@ impl<'a, C> DomainGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1489,25 +1465,15 @@ impl<'a, C> DomainListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1515,13 +1481,15 @@ impl<'a, C> DomainListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/gmailpostmastertools1/src/client.rs b/gen/gmailpostmastertools1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/gmailpostmastertools1/src/client.rs +++ b/gen/gmailpostmastertools1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/gmailpostmastertools1_beta1-cli/src/main.rs b/gen/gmailpostmastertools1_beta1-cli/src/main.rs index 3e1b6b924d..9f7a4083e4 100644 --- a/gen/gmailpostmastertools1_beta1-cli/src/main.rs +++ b/gen/gmailpostmastertools1_beta1-cli/src/main.rs @@ -119,7 +119,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -248,7 +248,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-date-day", "end-date-day", "start-date-month", "end-date-year", "end-date-month", "page-token", "start-date-year", "page-size"].iter().map(|v|*v)); + v.extend(["end-date-day", "end-date-month", "end-date-year", "page-size", "page-token", "start-date-day", "start-date-month", "start-date-year"].iter().map(|v|*v)); v } )); } } diff --git a/gen/gmailpostmastertools1_beta1/src/api.rs b/gen/gmailpostmastertools1_beta1/src/api.rs index 0dc6be6ac5..f8b144e248 100644 --- a/gen/gmailpostmastertools1_beta1/src/api.rs +++ b/gen/gmailpostmastertools1_beta1/src/api.rs @@ -612,25 +612,15 @@ impl<'a, C> DomainTrafficStatGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -638,13 +628,15 @@ impl<'a, C> DomainTrafficStatGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -919,25 +911,15 @@ impl<'a, C> DomainTrafficStatListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -945,13 +927,15 @@ impl<'a, C> DomainTrafficStatListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1242,25 +1226,15 @@ impl<'a, C> DomainGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1268,13 +1242,15 @@ impl<'a, C> DomainGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1492,25 +1468,15 @@ impl<'a, C> DomainListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1518,13 +1484,15 @@ impl<'a, C> DomainListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/gmailpostmastertools1_beta1/src/client.rs b/gen/gmailpostmastertools1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/gmailpostmastertools1_beta1/src/client.rs +++ b/gen/gmailpostmastertools1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/groupsmigration1/src/api.rs b/gen/groupsmigration1/src/api.rs index dbe6e34d78..b2f4423e00 100644 --- a/gen/groupsmigration1/src/api.rs +++ b/gen/groupsmigration1/src/api.rs @@ -410,25 +410,15 @@ impl<'a, C> ArchiveInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -436,13 +426,15 @@ impl<'a, C> ArchiveInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/groupsmigration1/src/client.rs b/gen/groupsmigration1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/groupsmigration1/src/client.rs +++ b/gen/groupsmigration1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/groupssettings1/src/api.rs b/gen/groupssettings1/src/api.rs index 4081588cf7..4640f9b6ef 100644 --- a/gen/groupssettings1/src/api.rs +++ b/gen/groupssettings1/src/api.rs @@ -812,25 +812,15 @@ impl<'a, C> GroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -838,13 +828,15 @@ impl<'a, C> GroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1092,25 +1084,15 @@ impl<'a, C> GroupPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1118,13 +1100,15 @@ impl<'a, C> GroupPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1381,25 +1365,15 @@ impl<'a, C> GroupUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1407,13 +1381,15 @@ impl<'a, C> GroupUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/groupssettings1/src/client.rs b/gen/groupssettings1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/groupssettings1/src/client.rs +++ b/gen/groupssettings1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/healthcare1-cli/src/main.rs b/gen/healthcare1-cli/src/main.rs index f7353c5615..68c351fee8 100644 --- a/gen/healthcare1-cli/src/main.rs +++ b/gen/healthcare1-cli/src/main.rs @@ -268,7 +268,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -719,7 +719,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1117,7 +1117,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1179,7 +1179,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1851,7 +1851,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2541,7 +2541,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3443,7 +3443,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -5213,7 +5213,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["-since", "end", "start", "-type", "-page-token", "-count"].iter().map(|v|*v)); + v.extend(["-count", "-page-token", "-since", "-type", "end", "start"].iter().map(|v|*v)); v } )); } } @@ -5606,7 +5606,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["-count", "-since", "-page-token", "-at"].iter().map(|v|*v)); + v.extend(["-at", "-count", "-page-token", "-since"].iter().map(|v|*v)); v } )); } } @@ -6308,7 +6308,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -7000,7 +7000,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -7362,7 +7362,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "view", "order-by", "filter"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token", "view"].iter().map(|v|*v)); v } )); } } @@ -7983,7 +7983,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -8359,7 +8359,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/healthcare1/src/api.rs b/gen/healthcare1/src/api.rs index 0cff06a859..8c1d2a135d 100644 --- a/gen/healthcare1/src/api.rs +++ b/gen/healthcare1/src/api.rs @@ -4851,25 +4851,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreAttributeDefinitionCreateCall<'a, return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4877,13 +4867,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreAttributeDefinitionCreateCall<'a, } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5134,25 +5126,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreAttributeDefinitionDeleteCall<'a, return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5160,13 +5142,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreAttributeDefinitionDeleteCall<'a, } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5401,25 +5385,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreAttributeDefinitionGetCall<'a, C> return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5427,13 +5401,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreAttributeDefinitionGetCall<'a, C> } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5683,25 +5659,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreAttributeDefinitionListCall<'a, C> return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5709,13 +5675,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreAttributeDefinitionListCall<'a, C> } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5997,25 +5965,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreAttributeDefinitionPatchCall<'a, C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6023,13 +5981,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreAttributeDefinitionPatchCall<'a, C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6301,25 +6261,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentArtifactCreateCall<'a, C> w return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6327,13 +6277,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentArtifactCreateCall<'a, C> w } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6577,25 +6529,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentArtifactDeleteCall<'a, C> w return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6603,13 +6545,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentArtifactDeleteCall<'a, C> w } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6844,25 +6788,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentArtifactGetCall<'a, C> wher return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6870,13 +6804,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentArtifactGetCall<'a, C> wher } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7126,25 +7062,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentArtifactListCall<'a, C> whe return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7152,13 +7078,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentArtifactListCall<'a, C> whe } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7435,25 +7363,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentActivateCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7461,13 +7379,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentActivateCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7732,25 +7652,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentCreateCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7758,13 +7668,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentCreateCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8008,25 +7920,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentDeleteCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8034,13 +7936,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentDeleteCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8275,25 +8179,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentDeleteRevisionCall<'a, C> w return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8301,13 +8195,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentDeleteRevisionCall<'a, C> w } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8542,25 +8438,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentGetCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8568,13 +8454,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentGetCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8824,25 +8712,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentListCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8850,13 +8728,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentListCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9127,25 +9007,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentListRevisionCall<'a, C> whe return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9153,13 +9023,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentListRevisionCall<'a, C> whe } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9441,25 +9313,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentPatchCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9467,13 +9329,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentPatchCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9745,25 +9609,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentRejectCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9771,13 +9625,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentRejectCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10042,25 +9898,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentRevokeCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10068,13 +9914,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentRevokeCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10339,25 +10187,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreUserDataMappingArchiveCall<'a, C> return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10365,13 +10203,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreUserDataMappingArchiveCall<'a, C> } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10636,25 +10476,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreUserDataMappingCreateCall<'a, C> w return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10662,13 +10492,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreUserDataMappingCreateCall<'a, C> w } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10912,25 +10744,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreUserDataMappingDeleteCall<'a, C> w return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10938,13 +10760,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreUserDataMappingDeleteCall<'a, C> w } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11179,25 +11003,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreUserDataMappingGetCall<'a, C> wher return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11205,13 +11019,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreUserDataMappingGetCall<'a, C> wher } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11461,25 +11277,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreUserDataMappingListCall<'a, C> whe return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11487,13 +11293,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreUserDataMappingListCall<'a, C> whe } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11775,25 +11583,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreUserDataMappingPatchCall<'a, C> wh return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11801,13 +11599,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreUserDataMappingPatchCall<'a, C> wh } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12079,25 +11879,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreCheckDataAccesCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12105,13 +11895,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreCheckDataAccesCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12381,25 +12173,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreCreateCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12407,13 +12189,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreCreateCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12664,25 +12448,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreDeleteCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12690,13 +12464,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreDeleteCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12952,25 +12728,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreEvaluateUserConsentCall<'a, C> whe return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12978,13 +12744,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreEvaluateUserConsentCall<'a, C> whe } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13228,25 +12996,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreGetCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13254,13 +13012,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreGetCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13500,25 +13260,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreGetIamPolicyCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13526,13 +13276,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreGetIamPolicyCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13789,25 +13541,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreListCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13815,13 +13557,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreListCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14103,25 +13847,15 @@ impl<'a, C> ProjectLocationDatasetConsentStorePatchCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14129,13 +13863,15 @@ impl<'a, C> ProjectLocationDatasetConsentStorePatchCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14407,25 +14143,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreQueryAccessibleDataCall<'a, C> whe return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14433,13 +14159,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreQueryAccessibleDataCall<'a, C> whe } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14704,25 +14432,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreSetIamPolicyCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14730,13 +14448,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreSetIamPolicyCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15001,25 +14721,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreTestIamPermissionCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15027,13 +14737,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreTestIamPermissionCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15279,25 +14991,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryInstanceFrameRetrieveFrameC return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15305,13 +15007,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryInstanceFrameRetrieveFrameC } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15558,25 +15262,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryInstanceFrameRetrieveRender return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15584,13 +15278,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryInstanceFrameRetrieveRender } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15837,25 +15533,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryInstanceDeleteCall<'a, C> w return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15863,13 +15549,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryInstanceDeleteCall<'a, C> w } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16116,25 +15804,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryInstanceRetrieveInstanceCal return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16142,13 +15820,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryInstanceRetrieveInstanceCal } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16395,25 +16075,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryInstanceRetrieveMetadataCal return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16421,13 +16091,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryInstanceRetrieveMetadataCal } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16674,25 +16346,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryInstanceRetrieveRenderedCal return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16700,13 +16362,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryInstanceRetrieveRenderedCal } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16953,25 +16617,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryDeleteCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16979,13 +16633,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryDeleteCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17232,25 +16888,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryRetrieveMetadataCall<'a, C> return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17258,13 +16904,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryRetrieveMetadataCall<'a, C> } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17511,25 +17159,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryRetrieveSeryCall<'a, C> whe return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17537,13 +17175,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryRetrieveSeryCall<'a, C> whe } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17790,25 +17430,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySerySearchForInstanceCall<'a, C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17816,13 +17446,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySerySearchForInstanceCall<'a, C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18069,25 +17701,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudyDeleteCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18095,13 +17717,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudyDeleteCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18347,25 +17971,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudyRetrieveMetadataCall<'a, C> whe return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18373,13 +17987,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudyRetrieveMetadataCall<'a, C> whe } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18626,25 +18242,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudyRetrieveStudyCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18652,13 +18258,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudyRetrieveStudyCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18905,25 +18513,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySearchForInstanceCall<'a, C> wh return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18931,13 +18529,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySearchForInstanceCall<'a, C> wh } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19184,25 +18784,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySearchForSeryCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19210,13 +18800,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySearchForSeryCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19484,25 +19076,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudyStoreInstanceCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19510,13 +19092,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudyStoreInstanceCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19796,25 +19380,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreCreateCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19822,13 +19396,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreCreateCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20100,25 +19676,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreDeidentifyCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20126,13 +19692,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreDeidentifyCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20376,25 +19944,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreDeleteCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20402,13 +19960,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreDeleteCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20664,25 +20224,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreExportCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20690,13 +20240,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreExportCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20940,25 +20492,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20966,13 +20508,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21212,25 +20756,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreGetIamPolicyCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21238,13 +20772,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreGetIamPolicyCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21507,25 +21043,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreImportCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21533,13 +21059,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreImportCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21798,25 +21326,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21824,13 +21342,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22112,25 +21632,15 @@ impl<'a, C> ProjectLocationDatasetDicomStorePatchCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22138,13 +21648,15 @@ impl<'a, C> ProjectLocationDatasetDicomStorePatchCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22397,25 +21909,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreSearchForInstanceCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22423,13 +21925,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreSearchForInstanceCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22676,25 +22180,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreSearchForSeryCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22702,13 +22196,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreSearchForSeryCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22955,25 +22451,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreSearchForStudyCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22981,13 +22467,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreSearchForStudyCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23253,25 +22741,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreSetIamPolicyCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23279,13 +22757,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreSetIamPolicyCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23552,25 +23032,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStoreInstanceCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23578,13 +23048,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStoreInstanceCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23859,25 +23331,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreTestIamPermissionCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23885,13 +23347,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreTestIamPermissionCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24165,25 +23629,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirPatientEverythingCall<'a, C> wher return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24191,13 +23645,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirPatientEverythingCall<'a, C> wher } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24474,25 +23930,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirResourcePurgeCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24500,13 +23946,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirResourcePurgeCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24741,25 +24189,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirCapabilityCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24767,13 +24205,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirCapabilityCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25031,25 +24471,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirCreateCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25057,13 +24487,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirCreateCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25317,25 +24749,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirDeleteCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25343,13 +24765,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirDeleteCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25605,25 +25029,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirExecuteBundleCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25631,13 +25045,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirExecuteBundleCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25901,25 +25317,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirHistoryCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25927,13 +25333,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirHistoryCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26217,25 +25625,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirPatchCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26243,13 +25641,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirPatchCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26493,25 +25893,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirReadCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26519,13 +25909,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirReadCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26781,25 +26173,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirSearchCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26807,13 +26189,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirSearchCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27080,25 +26464,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirSearchTypeCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27106,13 +26480,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirSearchTypeCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27387,25 +26763,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirUpdateCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27413,13 +26779,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirUpdateCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27663,25 +27031,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirVreadCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27689,13 +27047,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirVreadCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27956,25 +27316,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreCreateCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27982,13 +27332,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreCreateCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28260,25 +27612,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreDeidentifyCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28286,13 +27628,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreDeidentifyCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28536,25 +27880,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreDeleteCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28562,13 +27896,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreDeleteCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28824,25 +28160,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreExportCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28850,13 +28176,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreExportCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29100,25 +28428,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29126,13 +28444,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29372,25 +28692,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreGetIamPolicyCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29398,13 +28708,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreGetIamPolicyCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29667,25 +28979,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreImportCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29693,13 +28995,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreImportCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29958,25 +29262,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29984,13 +29278,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30272,25 +29568,15 @@ impl<'a, C> ProjectLocationDatasetFhirStorePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30298,13 +29584,15 @@ impl<'a, C> ProjectLocationDatasetFhirStorePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30576,25 +29864,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreSetIamPolicyCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30602,13 +29880,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreSetIamPolicyCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30873,25 +30153,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreTestIamPermissionCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30899,13 +30169,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreTestIamPermissionCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31170,25 +30442,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreMessageCreateCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31196,13 +30458,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreMessageCreateCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31446,25 +30710,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreMessageDeleteCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31472,13 +30726,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreMessageDeleteCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31718,25 +30974,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreMessageGetCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31744,13 +30990,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreMessageGetCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32013,25 +31261,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreMessageIngestCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32039,13 +31277,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreMessageIngestCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32314,25 +31554,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreMessageListCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32340,13 +31570,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreMessageListCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32642,25 +31874,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreMessagePatchCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32668,13 +31890,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreMessagePatchCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32951,25 +32175,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreCreateCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32977,13 +32191,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreCreateCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33234,25 +32450,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreDeleteCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33260,13 +32466,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreDeleteCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33501,25 +32709,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33527,13 +32725,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33773,25 +32973,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreGetIamPolicyCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33799,13 +32989,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreGetIamPolicyCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34062,25 +33254,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34088,13 +33270,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34376,25 +33560,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StorePatchCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34402,13 +33576,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StorePatchCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34680,25 +33856,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreSetIamPolicyCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34706,13 +33872,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreSetIamPolicyCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34977,25 +34145,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreTestIamPermissionCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35003,13 +34161,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreTestIamPermissionCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35274,25 +34434,15 @@ impl<'a, C> ProjectLocationDatasetOperationCancelCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35300,13 +34450,15 @@ impl<'a, C> ProjectLocationDatasetOperationCancelCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35550,25 +34702,15 @@ impl<'a, C> ProjectLocationDatasetOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35576,13 +34718,15 @@ impl<'a, C> ProjectLocationDatasetOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35832,25 +34976,15 @@ impl<'a, C> ProjectLocationDatasetOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35858,13 +34992,15 @@ impl<'a, C> ProjectLocationDatasetOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36146,25 +35282,15 @@ impl<'a, C> ProjectLocationDatasetCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36172,13 +35298,15 @@ impl<'a, C> ProjectLocationDatasetCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36450,25 +35578,15 @@ impl<'a, C> ProjectLocationDatasetDeidentifyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36476,13 +35594,15 @@ impl<'a, C> ProjectLocationDatasetDeidentifyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36726,25 +35846,15 @@ impl<'a, C> ProjectLocationDatasetDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36752,13 +35862,15 @@ impl<'a, C> ProjectLocationDatasetDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36993,25 +36105,15 @@ impl<'a, C> ProjectLocationDatasetGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37019,13 +36121,15 @@ impl<'a, C> ProjectLocationDatasetGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37265,25 +36369,15 @@ impl<'a, C> ProjectLocationDatasetGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37291,13 +36385,15 @@ impl<'a, C> ProjectLocationDatasetGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37549,25 +36645,15 @@ impl<'a, C> ProjectLocationDatasetListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37575,13 +36661,15 @@ impl<'a, C> ProjectLocationDatasetListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37856,25 +36944,15 @@ impl<'a, C> ProjectLocationDatasetPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37882,13 +36960,15 @@ impl<'a, C> ProjectLocationDatasetPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38160,25 +37240,15 @@ impl<'a, C> ProjectLocationDatasetSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38186,13 +37256,15 @@ impl<'a, C> ProjectLocationDatasetSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38457,25 +37529,15 @@ impl<'a, C> ProjectLocationDatasetTestIamPermissionCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38483,13 +37545,15 @@ impl<'a, C> ProjectLocationDatasetTestIamPermissionCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38733,25 +37797,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38759,13 +37813,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39015,25 +38071,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39041,13 +38087,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/healthcare1/src/client.rs b/gen/healthcare1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/healthcare1/src/client.rs +++ b/gen/healthcare1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/healthcare1_beta1-cli/src/main.rs b/gen/healthcare1_beta1-cli/src/main.rs index da9b157cdc..26e83bc0ce 100644 --- a/gen/healthcare1_beta1-cli/src/main.rs +++ b/gen/healthcare1_beta1-cli/src/main.rs @@ -266,7 +266,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter", "view"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token", "view"].iter().map(|v|*v)); v } )); } } @@ -939,7 +939,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1461,7 +1461,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1912,7 +1912,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2310,7 +2310,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2372,7 +2372,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3044,7 +3044,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3734,7 +3734,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -4642,7 +4642,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -6419,7 +6419,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["code", "concept-map-version", "source", "target", "url", "system"].iter().map(|v|*v)); + v.extend(["code", "concept-map-version", "source", "system", "target", "url"].iter().map(|v|*v)); v } )); } } @@ -6604,7 +6604,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["-count", "-page-token", "start", "-since", "-type", "end"].iter().map(|v|*v)); + v.extend(["-count", "-page-token", "-since", "-type", "end", "start"].iter().map(|v|*v)); v } )); } } @@ -7311,7 +7311,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["-since", "-page-token", "-at", "-count"].iter().map(|v|*v)); + v.extend(["-at", "-count", "-page-token", "-since"].iter().map(|v|*v)); v } )); } } @@ -8013,7 +8013,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -8885,7 +8885,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -9306,7 +9306,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "order-by", "filter", "view", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token", "view"].iter().map(|v|*v)); v } )); } } @@ -9732,7 +9732,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -9930,7 +9930,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -10306,7 +10306,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/healthcare1_beta1/src/api.rs b/gen/healthcare1_beta1/src/api.rs index 3d347da360..bf0290c057 100644 --- a/gen/healthcare1_beta1/src/api.rs +++ b/gen/healthcare1_beta1/src/api.rs @@ -6105,25 +6105,15 @@ impl<'a, C> ProjectLocationDatasetAnnotationStoreAnnotationCreateCall<'a, C> whe return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6131,13 +6121,15 @@ impl<'a, C> ProjectLocationDatasetAnnotationStoreAnnotationCreateCall<'a, C> whe } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6381,25 +6373,15 @@ impl<'a, C> ProjectLocationDatasetAnnotationStoreAnnotationDeleteCall<'a, C> whe return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6407,13 +6389,15 @@ impl<'a, C> ProjectLocationDatasetAnnotationStoreAnnotationDeleteCall<'a, C> whe } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6648,25 +6632,15 @@ impl<'a, C> ProjectLocationDatasetAnnotationStoreAnnotationGetCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6674,13 +6648,15 @@ impl<'a, C> ProjectLocationDatasetAnnotationStoreAnnotationGetCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6935,25 +6911,15 @@ impl<'a, C> ProjectLocationDatasetAnnotationStoreAnnotationListCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6961,13 +6927,15 @@ impl<'a, C> ProjectLocationDatasetAnnotationStoreAnnotationListCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7256,25 +7224,15 @@ impl<'a, C> ProjectLocationDatasetAnnotationStoreAnnotationPatchCall<'a, C> wher return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7282,13 +7240,15 @@ impl<'a, C> ProjectLocationDatasetAnnotationStoreAnnotationPatchCall<'a, C> wher } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7565,25 +7525,15 @@ impl<'a, C> ProjectLocationDatasetAnnotationStoreCreateCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7591,13 +7541,15 @@ impl<'a, C> ProjectLocationDatasetAnnotationStoreCreateCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7848,25 +7800,15 @@ impl<'a, C> ProjectLocationDatasetAnnotationStoreDeleteCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7874,13 +7816,15 @@ impl<'a, C> ProjectLocationDatasetAnnotationStoreDeleteCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8136,25 +8080,15 @@ impl<'a, C> ProjectLocationDatasetAnnotationStoreEvaluateCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8162,13 +8096,15 @@ impl<'a, C> ProjectLocationDatasetAnnotationStoreEvaluateCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8433,25 +8369,15 @@ impl<'a, C> ProjectLocationDatasetAnnotationStoreExportCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8459,13 +8385,15 @@ impl<'a, C> ProjectLocationDatasetAnnotationStoreExportCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8709,25 +8637,15 @@ impl<'a, C> ProjectLocationDatasetAnnotationStoreGetCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8735,13 +8653,15 @@ impl<'a, C> ProjectLocationDatasetAnnotationStoreGetCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8981,25 +8901,15 @@ impl<'a, C> ProjectLocationDatasetAnnotationStoreGetIamPolicyCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9007,13 +8917,15 @@ impl<'a, C> ProjectLocationDatasetAnnotationStoreGetIamPolicyCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9276,25 +9188,15 @@ impl<'a, C> ProjectLocationDatasetAnnotationStoreImportCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9302,13 +9204,15 @@ impl<'a, C> ProjectLocationDatasetAnnotationStoreImportCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9567,25 +9471,15 @@ impl<'a, C> ProjectLocationDatasetAnnotationStoreListCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9593,13 +9487,15 @@ impl<'a, C> ProjectLocationDatasetAnnotationStoreListCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9881,25 +9777,15 @@ impl<'a, C> ProjectLocationDatasetAnnotationStorePatchCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9907,13 +9793,15 @@ impl<'a, C> ProjectLocationDatasetAnnotationStorePatchCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10185,25 +10073,15 @@ impl<'a, C> ProjectLocationDatasetAnnotationStoreSetIamPolicyCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10211,13 +10089,15 @@ impl<'a, C> ProjectLocationDatasetAnnotationStoreSetIamPolicyCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10482,25 +10362,15 @@ impl<'a, C> ProjectLocationDatasetAnnotationStoreTestIamPermissionCall<'a, C> wh return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10508,13 +10378,15 @@ impl<'a, C> ProjectLocationDatasetAnnotationStoreTestIamPermissionCall<'a, C> wh } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10784,25 +10656,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreAttributeDefinitionCreateCall<'a, return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10810,13 +10672,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreAttributeDefinitionCreateCall<'a, } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11067,25 +10931,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreAttributeDefinitionDeleteCall<'a, return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11093,13 +10947,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreAttributeDefinitionDeleteCall<'a, } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11334,25 +11190,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreAttributeDefinitionGetCall<'a, C> return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11360,13 +11206,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreAttributeDefinitionGetCall<'a, C> } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11616,25 +11464,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreAttributeDefinitionListCall<'a, C> return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11642,13 +11480,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreAttributeDefinitionListCall<'a, C> } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11930,25 +11770,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreAttributeDefinitionPatchCall<'a, C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11956,13 +11786,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreAttributeDefinitionPatchCall<'a, C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12234,25 +12066,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentArtifactCreateCall<'a, C> w return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12260,13 +12082,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentArtifactCreateCall<'a, C> w } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12510,25 +12334,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentArtifactDeleteCall<'a, C> w return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12536,13 +12350,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentArtifactDeleteCall<'a, C> w } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12777,25 +12593,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentArtifactGetCall<'a, C> wher return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12803,13 +12609,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentArtifactGetCall<'a, C> wher } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13059,25 +12867,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentArtifactListCall<'a, C> whe return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13085,13 +12883,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentArtifactListCall<'a, C> whe } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13368,25 +13168,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentActivateCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13394,13 +13184,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentActivateCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13665,25 +13457,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentCreateCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13691,13 +13473,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentCreateCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13941,25 +13725,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentDeleteCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13967,13 +13741,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentDeleteCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14208,25 +13984,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentDeleteRevisionCall<'a, C> w return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14234,13 +14000,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentDeleteRevisionCall<'a, C> w } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14475,25 +14243,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentGetCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14501,13 +14259,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentGetCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14757,25 +14517,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentListCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14783,13 +14533,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentListCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15060,25 +14812,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentListRevisionCall<'a, C> whe return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15086,13 +14828,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentListRevisionCall<'a, C> whe } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15374,25 +15118,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentPatchCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15400,13 +15134,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentPatchCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15678,25 +15414,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentRejectCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15704,13 +15430,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentRejectCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15975,25 +15703,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentRevokeCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16001,13 +15719,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreConsentRevokeCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16272,25 +15992,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreUserDataMappingArchiveCall<'a, C> return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16298,13 +16008,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreUserDataMappingArchiveCall<'a, C> } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16569,25 +16281,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreUserDataMappingCreateCall<'a, C> w return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16595,13 +16297,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreUserDataMappingCreateCall<'a, C> w } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16845,25 +16549,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreUserDataMappingDeleteCall<'a, C> w return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16871,13 +16565,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreUserDataMappingDeleteCall<'a, C> w } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17112,25 +16808,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreUserDataMappingGetCall<'a, C> wher return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17138,13 +16824,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreUserDataMappingGetCall<'a, C> wher } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17394,25 +17082,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreUserDataMappingListCall<'a, C> whe return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17420,13 +17098,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreUserDataMappingListCall<'a, C> whe } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17708,25 +17388,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreUserDataMappingPatchCall<'a, C> wh return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17734,13 +17404,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreUserDataMappingPatchCall<'a, C> wh } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18012,25 +17684,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreCheckDataAccesCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18038,13 +17700,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreCheckDataAccesCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18314,25 +17978,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreCreateCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18340,13 +17994,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreCreateCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18597,25 +18253,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreDeleteCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18623,13 +18269,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreDeleteCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18885,25 +18533,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreEvaluateUserConsentCall<'a, C> whe return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18911,13 +18549,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreEvaluateUserConsentCall<'a, C> whe } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19161,25 +18801,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreGetCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19187,13 +18817,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreGetCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19433,25 +19065,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreGetIamPolicyCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19459,13 +19081,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreGetIamPolicyCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19722,25 +19346,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreListCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19748,13 +19362,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreListCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20036,25 +19652,15 @@ impl<'a, C> ProjectLocationDatasetConsentStorePatchCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20062,13 +19668,15 @@ impl<'a, C> ProjectLocationDatasetConsentStorePatchCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20340,25 +19948,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreQueryAccessibleDataCall<'a, C> whe return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20366,13 +19964,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreQueryAccessibleDataCall<'a, C> whe } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20637,25 +20237,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreSetIamPolicyCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20663,13 +20253,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreSetIamPolicyCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20934,25 +20526,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreTestIamPermissionCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20960,13 +20542,15 @@ impl<'a, C> ProjectLocationDatasetConsentStoreTestIamPermissionCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21212,25 +20796,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryInstanceFrameRetrieveFrameC return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21238,13 +20812,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryInstanceFrameRetrieveFrameC } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21491,25 +21067,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryInstanceFrameRetrieveRender return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21517,13 +21083,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryInstanceFrameRetrieveRender } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21770,25 +21338,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryInstanceDeleteCall<'a, C> w return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21796,13 +21354,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryInstanceDeleteCall<'a, C> w } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22049,25 +21609,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryInstanceRetrieveInstanceCal return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22075,13 +21625,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryInstanceRetrieveInstanceCal } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22328,25 +21880,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryInstanceRetrieveMetadataCal return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22354,13 +21896,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryInstanceRetrieveMetadataCal } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22607,25 +22151,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryInstanceRetrieveRenderedCal return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22633,13 +22167,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryInstanceRetrieveRenderedCal } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22886,25 +22422,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryDeleteCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22912,13 +22438,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryDeleteCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23165,25 +22693,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryRetrieveMetadataCall<'a, C> return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23191,13 +22709,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryRetrieveMetadataCall<'a, C> } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23444,25 +22964,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryRetrieveSeryCall<'a, C> whe return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23470,13 +22980,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySeryRetrieveSeryCall<'a, C> whe } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23723,25 +23235,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySerySearchForInstanceCall<'a, C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23749,13 +23251,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySerySearchForInstanceCall<'a, C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24002,25 +23506,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudyDeleteCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24028,13 +23522,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudyDeleteCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24280,25 +23776,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudyRetrieveMetadataCall<'a, C> whe return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24306,13 +23792,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudyRetrieveMetadataCall<'a, C> whe } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24559,25 +24047,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudyRetrieveStudyCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24585,13 +24063,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudyRetrieveStudyCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24838,25 +24318,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySearchForInstanceCall<'a, C> wh return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24864,13 +24334,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySearchForInstanceCall<'a, C> wh } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25117,25 +24589,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySearchForSeryCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25143,13 +24605,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudySearchForSeryCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25417,25 +24881,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudyStoreInstanceCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25443,13 +24897,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStudyStoreInstanceCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25729,25 +25185,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreCreateCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25755,13 +25201,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreCreateCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26033,25 +25481,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreDeidentifyCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26059,13 +25497,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreDeidentifyCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26309,25 +25749,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreDeleteCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26335,13 +25765,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreDeleteCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26597,25 +26029,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreExportCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26623,13 +26045,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreExportCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26873,25 +26297,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26899,13 +26313,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27145,25 +26561,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreGetIamPolicyCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27171,13 +26577,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreGetIamPolicyCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27440,25 +26848,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreImportCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27466,13 +26864,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreImportCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27731,25 +27131,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27757,13 +27147,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28045,25 +27437,15 @@ impl<'a, C> ProjectLocationDatasetDicomStorePatchCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28071,13 +27453,15 @@ impl<'a, C> ProjectLocationDatasetDicomStorePatchCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28330,25 +27714,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreSearchForInstanceCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28356,13 +27730,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreSearchForInstanceCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28609,25 +27985,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreSearchForSeryCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28635,13 +28001,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreSearchForSeryCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28888,25 +28256,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreSearchForStudyCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28914,13 +28272,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreSearchForStudyCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29186,25 +28546,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreSetIamPolicyCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29212,13 +28562,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreSetIamPolicyCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29485,25 +28837,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStoreInstanceCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29511,13 +28853,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreStoreInstanceCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29792,25 +29136,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreTestIamPermissionCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29818,13 +29152,15 @@ impl<'a, C> ProjectLocationDatasetDicomStoreTestIamPermissionCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30098,25 +29434,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirConceptMapSearchTranslateCall<'a, return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30124,13 +29450,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirConceptMapSearchTranslateCall<'a, } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30422,25 +29750,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirConceptMapTranslateCall<'a, C> wh return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30448,13 +29766,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirConceptMapTranslateCall<'a, C> wh } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30710,25 +30030,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirObservationLastnCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30736,13 +30046,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirObservationLastnCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31007,25 +30319,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirPatientEverythingCall<'a, C> wher return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31033,13 +30335,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirPatientEverythingCall<'a, C> wher } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31316,25 +30620,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirResourcePurgeCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31342,13 +30636,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirResourcePurgeCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31611,25 +30907,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirResourceValidateCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31637,13 +30923,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirResourceValidateCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31904,25 +31192,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirCapabilityCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31930,13 +31208,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirCapabilityCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32173,25 +31453,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirConditionalDeleteCall<'a, C> wher return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32199,13 +31469,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirConditionalDeleteCall<'a, C> wher } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32473,25 +31745,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirConditionalPatchCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32499,13 +31761,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirConditionalPatchCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32782,25 +32046,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirConditionalUpdateCall<'a, C> wher return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32808,13 +32062,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirConditionalUpdateCall<'a, C> wher } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33091,25 +32347,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirCreateCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33117,13 +32363,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirCreateCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33377,25 +32625,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirDeleteCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33403,13 +32641,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirDeleteCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33665,25 +32905,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirExecuteBundleCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33691,13 +32921,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirExecuteBundleCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33961,25 +33193,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirHistoryCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33987,13 +33209,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirHistoryCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34277,25 +33501,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirPatchCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34303,13 +33517,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirPatchCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34553,25 +33769,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirReadCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34579,13 +33785,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirReadCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34841,25 +34049,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirSearchCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34867,13 +34065,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirSearchCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35140,25 +34340,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirSearchTypeCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35166,13 +34356,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirSearchTypeCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35447,25 +34639,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirUpdateCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35473,13 +34655,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirUpdateCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35723,25 +34907,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirVreadCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35749,13 +34923,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreFhirVreadCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36016,25 +35192,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreCreateCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36042,13 +35208,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreCreateCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36320,25 +35488,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreDeidentifyCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36346,13 +35504,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreDeidentifyCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36596,25 +35756,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreDeleteCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36622,13 +35772,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreDeleteCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36884,25 +36036,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreExportCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36910,13 +36052,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreExportCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37160,25 +36304,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37186,13 +36320,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37432,25 +36568,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreGetIamPolicyCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37458,13 +36584,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreGetIamPolicyCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37727,25 +36855,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreImportCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37753,13 +36871,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreImportCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38018,25 +37138,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38044,13 +37154,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38332,25 +37444,15 @@ impl<'a, C> ProjectLocationDatasetFhirStorePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38358,13 +37460,15 @@ impl<'a, C> ProjectLocationDatasetFhirStorePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38636,25 +37740,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreSetIamPolicyCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38662,13 +37756,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreSetIamPolicyCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38933,25 +38029,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreTestIamPermissionCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38959,13 +38045,15 @@ impl<'a, C> ProjectLocationDatasetFhirStoreTestIamPermissionCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39221,25 +38309,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreMessageBatchGetCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39247,13 +38325,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreMessageBatchGetCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39524,25 +38604,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreMessageCreateCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39550,13 +38620,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreMessageCreateCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39800,25 +38872,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreMessageDeleteCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39826,13 +38888,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreMessageDeleteCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40072,25 +39136,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreMessageGetCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40098,13 +39152,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreMessageGetCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40367,25 +39423,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreMessageIngestCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40393,13 +39439,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreMessageIngestCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40668,25 +39716,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreMessageListCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40694,13 +39732,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreMessageListCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40996,25 +40036,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreMessagePatchCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41022,13 +40052,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreMessagePatchCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41305,25 +40337,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreCreateCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41331,13 +40353,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreCreateCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41588,25 +40612,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreDeleteCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41614,13 +40628,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreDeleteCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41876,25 +40892,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreExportCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41902,13 +40908,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreExportCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42152,25 +41160,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42178,13 +41176,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42424,25 +41424,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreGetIamPolicyCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42450,13 +41440,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreGetIamPolicyCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42719,25 +41711,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreImportCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42745,13 +41727,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreImportCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43010,25 +41994,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43036,13 +42010,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43324,25 +42300,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StorePatchCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43350,13 +42316,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StorePatchCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43628,25 +42596,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreSetIamPolicyCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43654,13 +42612,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreSetIamPolicyCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43925,25 +42885,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreTestIamPermissionCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43951,13 +42901,15 @@ impl<'a, C> ProjectLocationDatasetHl7V2StoreTestIamPermissionCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44222,25 +43174,15 @@ impl<'a, C> ProjectLocationDatasetOperationCancelCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44248,13 +43190,15 @@ impl<'a, C> ProjectLocationDatasetOperationCancelCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44498,25 +43442,15 @@ impl<'a, C> ProjectLocationDatasetOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44524,13 +43458,15 @@ impl<'a, C> ProjectLocationDatasetOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44780,25 +43716,15 @@ impl<'a, C> ProjectLocationDatasetOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44806,13 +43732,15 @@ impl<'a, C> ProjectLocationDatasetOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45094,25 +44022,15 @@ impl<'a, C> ProjectLocationDatasetCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45120,13 +44038,15 @@ impl<'a, C> ProjectLocationDatasetCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45398,25 +44318,15 @@ impl<'a, C> ProjectLocationDatasetDeidentifyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45424,13 +44334,15 @@ impl<'a, C> ProjectLocationDatasetDeidentifyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45674,25 +44586,15 @@ impl<'a, C> ProjectLocationDatasetDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45700,13 +44602,15 @@ impl<'a, C> ProjectLocationDatasetDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45941,25 +44845,15 @@ impl<'a, C> ProjectLocationDatasetGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45967,13 +44861,15 @@ impl<'a, C> ProjectLocationDatasetGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46213,25 +45109,15 @@ impl<'a, C> ProjectLocationDatasetGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46239,13 +45125,15 @@ impl<'a, C> ProjectLocationDatasetGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46497,25 +45385,15 @@ impl<'a, C> ProjectLocationDatasetListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46523,13 +45401,15 @@ impl<'a, C> ProjectLocationDatasetListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -46804,25 +45684,15 @@ impl<'a, C> ProjectLocationDatasetPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -46830,13 +45700,15 @@ impl<'a, C> ProjectLocationDatasetPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47108,25 +45980,15 @@ impl<'a, C> ProjectLocationDatasetSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47134,13 +45996,15 @@ impl<'a, C> ProjectLocationDatasetSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47405,25 +46269,15 @@ impl<'a, C> ProjectLocationDatasetTestIamPermissionCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47431,13 +46285,15 @@ impl<'a, C> ProjectLocationDatasetTestIamPermissionCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47702,25 +46558,15 @@ impl<'a, C> ProjectLocationServiceNlpAnalyzeEntityCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -47728,13 +46574,15 @@ impl<'a, C> ProjectLocationServiceNlpAnalyzeEntityCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -47978,25 +46826,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -48004,13 +46842,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -48260,25 +47100,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -48286,13 +47116,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/healthcare1_beta1/src/client.rs b/gen/healthcare1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/healthcare1_beta1/src/client.rs +++ b/gen/healthcare1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/iam1-cli/src/main.rs b/gen/iam1-cli/src/main.rs index 2b5cbd7d2a..360571dbd5 100644 --- a/gen/iam1-cli/src/main.rs +++ b/gen/iam1-cli/src/main.rs @@ -447,7 +447,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "show-deleted", "page-token", "view"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "show-deleted", "view"].iter().map(|v|*v)); v } )); } } @@ -973,7 +973,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "show-deleted", "page-token"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "show-deleted"].iter().map(|v|*v)); v } )); } } @@ -1382,7 +1382,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "show-deleted", "page-token"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "show-deleted"].iter().map(|v|*v)); v } )); } } @@ -1965,7 +1965,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "show-deleted", "page-token", "view"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "show-deleted", "view"].iter().map(|v|*v)); v } )); } } @@ -3694,7 +3694,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["show-deleted", "page-size", "page-token", "view", "parent"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "parent", "show-deleted", "view"].iter().map(|v|*v)); v } )); } } diff --git a/gen/iam1/src/api.rs b/gen/iam1/src/api.rs index c418d25b5a..534d4977d2 100644 --- a/gen/iam1/src/api.rs +++ b/gen/iam1/src/api.rs @@ -2587,25 +2587,15 @@ impl<'a, C> IamPolicyLintPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2613,13 +2603,15 @@ impl<'a, C> IamPolicyLintPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2847,25 +2839,15 @@ impl<'a, C> IamPolicyQueryAuditableServiceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2873,13 +2855,15 @@ impl<'a, C> IamPolicyQueryAuditableServiceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3134,25 +3118,15 @@ impl<'a, C> OrganizationRoleCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3160,13 +3134,15 @@ impl<'a, C> OrganizationRoleCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3415,25 +3391,15 @@ impl<'a, C> OrganizationRoleDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3441,13 +3407,15 @@ impl<'a, C> OrganizationRoleDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3689,25 +3657,15 @@ impl<'a, C> OrganizationRoleGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3715,13 +3673,15 @@ impl<'a, C> OrganizationRoleGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3976,25 +3936,15 @@ impl<'a, C> OrganizationRoleListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4002,13 +3952,15 @@ impl<'a, C> OrganizationRoleListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4297,25 +4249,15 @@ impl<'a, C> OrganizationRolePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4323,13 +4265,15 @@ impl<'a, C> OrganizationRolePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4601,25 +4545,15 @@ impl<'a, C> OrganizationRoleUndeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4627,13 +4561,15 @@ impl<'a, C> OrganizationRoleUndeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4871,25 +4807,15 @@ impl<'a, C> PermissionQueryTestablePermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4897,13 +4823,15 @@ impl<'a, C> PermissionQueryTestablePermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5137,25 +5065,15 @@ impl<'a, C> ProjectLocationWorkloadIdentityPoolOperationGetCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5163,13 +5081,15 @@ impl<'a, C> ProjectLocationWorkloadIdentityPoolOperationGetCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5404,25 +5324,15 @@ impl<'a, C> ProjectLocationWorkloadIdentityPoolProviderOperationGetCall<'a, C> w return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5430,13 +5340,15 @@ impl<'a, C> ProjectLocationWorkloadIdentityPoolProviderOperationGetCall<'a, C> w } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5697,25 +5609,15 @@ impl<'a, C> ProjectLocationWorkloadIdentityPoolProviderCreateCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5723,13 +5625,15 @@ impl<'a, C> ProjectLocationWorkloadIdentityPoolProviderCreateCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5980,25 +5884,15 @@ impl<'a, C> ProjectLocationWorkloadIdentityPoolProviderDeleteCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6006,13 +5900,15 @@ impl<'a, C> ProjectLocationWorkloadIdentityPoolProviderDeleteCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6247,25 +6143,15 @@ impl<'a, C> ProjectLocationWorkloadIdentityPoolProviderGetCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6273,13 +6159,15 @@ impl<'a, C> ProjectLocationWorkloadIdentityPoolProviderGetCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6529,25 +6417,15 @@ impl<'a, C> ProjectLocationWorkloadIdentityPoolProviderListCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6555,13 +6433,15 @@ impl<'a, C> ProjectLocationWorkloadIdentityPoolProviderListCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6843,25 +6723,15 @@ impl<'a, C> ProjectLocationWorkloadIdentityPoolProviderPatchCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6869,13 +6739,15 @@ impl<'a, C> ProjectLocationWorkloadIdentityPoolProviderPatchCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7147,25 +7019,15 @@ impl<'a, C> ProjectLocationWorkloadIdentityPoolProviderUndeleteCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7173,13 +7035,15 @@ impl<'a, C> ProjectLocationWorkloadIdentityPoolProviderUndeleteCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7449,25 +7313,15 @@ impl<'a, C> ProjectLocationWorkloadIdentityPoolCreateCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7475,13 +7329,15 @@ impl<'a, C> ProjectLocationWorkloadIdentityPoolCreateCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7732,25 +7588,15 @@ impl<'a, C> ProjectLocationWorkloadIdentityPoolDeleteCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7758,13 +7604,15 @@ impl<'a, C> ProjectLocationWorkloadIdentityPoolDeleteCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7999,25 +7847,15 @@ impl<'a, C> ProjectLocationWorkloadIdentityPoolGetCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8025,13 +7863,15 @@ impl<'a, C> ProjectLocationWorkloadIdentityPoolGetCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8281,25 +8121,15 @@ impl<'a, C> ProjectLocationWorkloadIdentityPoolListCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8307,13 +8137,15 @@ impl<'a, C> ProjectLocationWorkloadIdentityPoolListCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8595,25 +8427,15 @@ impl<'a, C> ProjectLocationWorkloadIdentityPoolPatchCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8621,13 +8443,15 @@ impl<'a, C> ProjectLocationWorkloadIdentityPoolPatchCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8899,25 +8723,15 @@ impl<'a, C> ProjectLocationWorkloadIdentityPoolUndeleteCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8925,13 +8739,15 @@ impl<'a, C> ProjectLocationWorkloadIdentityPoolUndeleteCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9196,25 +9012,15 @@ impl<'a, C> ProjectRoleCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9222,13 +9028,15 @@ impl<'a, C> ProjectRoleCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9477,25 +9285,15 @@ impl<'a, C> ProjectRoleDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9503,13 +9301,15 @@ impl<'a, C> ProjectRoleDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9751,25 +9551,15 @@ impl<'a, C> ProjectRoleGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9777,13 +9567,15 @@ impl<'a, C> ProjectRoleGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10038,25 +9830,15 @@ impl<'a, C> ProjectRoleListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10064,13 +9846,15 @@ impl<'a, C> ProjectRoleListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10359,25 +10143,15 @@ impl<'a, C> ProjectRolePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10385,13 +10159,15 @@ impl<'a, C> ProjectRolePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10663,25 +10439,15 @@ impl<'a, C> ProjectRoleUndeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10689,13 +10455,15 @@ impl<'a, C> ProjectRoleUndeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10960,25 +10728,15 @@ impl<'a, C> ProjectServiceAccountKeyCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10986,13 +10744,15 @@ impl<'a, C> ProjectServiceAccountKeyCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11236,25 +10996,15 @@ impl<'a, C> ProjectServiceAccountKeyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11262,13 +11012,15 @@ impl<'a, C> ProjectServiceAccountKeyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11508,25 +11260,15 @@ impl<'a, C> ProjectServiceAccountKeyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11534,13 +11276,15 @@ impl<'a, C> ProjectServiceAccountKeyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11789,25 +11533,15 @@ impl<'a, C> ProjectServiceAccountKeyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11815,13 +11549,15 @@ impl<'a, C> ProjectServiceAccountKeyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12085,25 +11821,15 @@ impl<'a, C> ProjectServiceAccountKeyUploadCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12111,13 +11837,15 @@ impl<'a, C> ProjectServiceAccountKeyUploadCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12382,25 +12110,15 @@ impl<'a, C> ProjectServiceAccountCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12408,13 +12126,15 @@ impl<'a, C> ProjectServiceAccountCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12658,25 +12378,15 @@ impl<'a, C> ProjectServiceAccountDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12684,13 +12394,15 @@ impl<'a, C> ProjectServiceAccountDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12946,25 +12658,15 @@ impl<'a, C> ProjectServiceAccountDisableCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12972,13 +12674,15 @@ impl<'a, C> ProjectServiceAccountDisableCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13243,25 +12947,15 @@ impl<'a, C> ProjectServiceAccountEnableCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13269,13 +12963,15 @@ impl<'a, C> ProjectServiceAccountEnableCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13519,25 +13215,15 @@ impl<'a, C> ProjectServiceAccountGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13545,13 +13231,15 @@ impl<'a, C> ProjectServiceAccountGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13791,25 +13479,15 @@ impl<'a, C> ProjectServiceAccountGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13817,13 +13495,15 @@ impl<'a, C> ProjectServiceAccountGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14075,25 +13755,15 @@ impl<'a, C> ProjectServiceAccountListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14101,13 +13771,15 @@ impl<'a, C> ProjectServiceAccountListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14377,25 +14049,15 @@ impl<'a, C> ProjectServiceAccountPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14403,13 +14065,15 @@ impl<'a, C> ProjectServiceAccountPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14674,25 +14338,15 @@ impl<'a, C> ProjectServiceAccountSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14700,13 +14354,15 @@ impl<'a, C> ProjectServiceAccountSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14971,25 +14627,15 @@ impl<'a, C> ProjectServiceAccountSignBlobCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14997,13 +14643,15 @@ impl<'a, C> ProjectServiceAccountSignBlobCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15268,25 +14916,15 @@ impl<'a, C> ProjectServiceAccountSignJwtCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15294,13 +14932,15 @@ impl<'a, C> ProjectServiceAccountSignJwtCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15565,25 +15205,15 @@ impl<'a, C> ProjectServiceAccountTestIamPermissionCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15591,13 +15221,15 @@ impl<'a, C> ProjectServiceAccountTestIamPermissionCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15862,25 +15494,15 @@ impl<'a, C> ProjectServiceAccountUndeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15888,13 +15510,15 @@ impl<'a, C> ProjectServiceAccountUndeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16159,25 +15783,15 @@ impl<'a, C> ProjectServiceAccountUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16185,13 +15799,15 @@ impl<'a, C> ProjectServiceAccountUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16435,25 +16051,15 @@ impl<'a, C> RoleGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16461,13 +16067,15 @@ impl<'a, C> RoleGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16700,25 +16308,15 @@ impl<'a, C> RoleListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16726,13 +16324,15 @@ impl<'a, C> RoleListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16986,25 +16586,15 @@ impl<'a, C> RoleQueryGrantableRoleCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17012,13 +16602,15 @@ impl<'a, C> RoleQueryGrantableRoleCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/iam1/src/client.rs b/gen/iam1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/iam1/src/client.rs +++ b/gen/iam1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/iamcredentials1/src/api.rs b/gen/iamcredentials1/src/api.rs index b0155164c2..5435d781c3 100644 --- a/gen/iamcredentials1/src/api.rs +++ b/gen/iamcredentials1/src/api.rs @@ -627,25 +627,15 @@ impl<'a, C> ProjectServiceAccountGenerateAccessTokenCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -653,13 +643,15 @@ impl<'a, C> ProjectServiceAccountGenerateAccessTokenCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -924,25 +916,15 @@ impl<'a, C> ProjectServiceAccountGenerateIdTokenCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -950,13 +932,15 @@ impl<'a, C> ProjectServiceAccountGenerateIdTokenCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1221,25 +1205,15 @@ impl<'a, C> ProjectServiceAccountSignBlobCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1247,13 +1221,15 @@ impl<'a, C> ProjectServiceAccountSignBlobCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1518,25 +1494,15 @@ impl<'a, C> ProjectServiceAccountSignJwtCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1544,13 +1510,15 @@ impl<'a, C> ProjectServiceAccountSignJwtCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/iamcredentials1/src/client.rs b/gen/iamcredentials1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/iamcredentials1/src/client.rs +++ b/gen/iamcredentials1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/iap1-cli/src/main.rs b/gen/iap1-cli/src/main.rs index ef75dc3f1a..74025f3d73 100644 --- a/gen/iap1-cli/src/main.rs +++ b/gen/iap1-cli/src/main.rs @@ -811,7 +811,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/iap1/src/api.rs b/gen/iap1/src/api.rs index f031c3cb03..4703fb5989 100644 --- a/gen/iap1/src/api.rs +++ b/gen/iap1/src/api.rs @@ -1138,25 +1138,15 @@ impl<'a, C> ProjectBrandIdentityAwareProxyClientCreateCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1164,13 +1154,15 @@ impl<'a, C> ProjectBrandIdentityAwareProxyClientCreateCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1414,25 +1406,15 @@ impl<'a, C> ProjectBrandIdentityAwareProxyClientDeleteCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1440,13 +1422,15 @@ impl<'a, C> ProjectBrandIdentityAwareProxyClientDeleteCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1681,25 +1665,15 @@ impl<'a, C> ProjectBrandIdentityAwareProxyClientGetCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1707,13 +1681,15 @@ impl<'a, C> ProjectBrandIdentityAwareProxyClientGetCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1958,25 +1934,15 @@ impl<'a, C> ProjectBrandIdentityAwareProxyClientListCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1984,13 +1950,15 @@ impl<'a, C> ProjectBrandIdentityAwareProxyClientListCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2260,25 +2228,15 @@ impl<'a, C> ProjectBrandIdentityAwareProxyClientResetSecretCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2286,13 +2244,15 @@ impl<'a, C> ProjectBrandIdentityAwareProxyClientResetSecretCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2557,25 +2517,15 @@ impl<'a, C> ProjectBrandCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2583,13 +2533,15 @@ impl<'a, C> ProjectBrandCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2833,25 +2785,15 @@ impl<'a, C> ProjectBrandGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2859,13 +2801,15 @@ impl<'a, C> ProjectBrandGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3100,25 +3044,15 @@ impl<'a, C> ProjectBrandListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3126,13 +3060,15 @@ impl<'a, C> ProjectBrandListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3388,25 +3324,15 @@ impl<'a, C> MethodGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3414,13 +3340,15 @@ impl<'a, C> MethodGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3664,25 +3592,15 @@ impl<'a, C> MethodGetIapSettingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3690,13 +3608,15 @@ impl<'a, C> MethodGetIapSettingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3952,25 +3872,15 @@ impl<'a, C> MethodSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3978,13 +3888,15 @@ impl<'a, C> MethodSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4249,25 +4161,15 @@ impl<'a, C> MethodTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4275,13 +4177,15 @@ impl<'a, C> MethodTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4551,25 +4455,15 @@ impl<'a, C> MethodUpdateIapSettingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4577,13 +4471,15 @@ impl<'a, C> MethodUpdateIapSettingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/iap1/src/client.rs b/gen/iap1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/iap1/src/client.rs +++ b/gen/iap1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/iap1_beta1/src/api.rs b/gen/iap1_beta1/src/api.rs index dc9e11c53c..fb4df077c2 100644 --- a/gen/iap1_beta1/src/api.rs +++ b/gen/iap1_beta1/src/api.rs @@ -584,25 +584,15 @@ impl<'a, C> MethodGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -610,13 +600,15 @@ impl<'a, C> MethodGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -881,25 +873,15 @@ impl<'a, C> MethodSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -907,13 +889,15 @@ impl<'a, C> MethodSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1178,25 +1162,15 @@ impl<'a, C> MethodTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1204,13 +1178,15 @@ impl<'a, C> MethodTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/iap1_beta1/src/client.rs b/gen/iap1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/iap1_beta1/src/client.rs +++ b/gen/iap1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/identitytoolkit3-cli/src/main.rs b/gen/identitytoolkit3-cli/src/main.rs index 10b621f9c9..e70b65cf40 100644 --- a/gen/identitytoolkit3-cli/src/main.rs +++ b/gen/identitytoolkit3-cli/src/main.rs @@ -617,7 +617,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["project-number", "delegated-project-number"].iter().map(|v|*v)); + v.extend(["delegated-project-number", "project-number"].iter().map(|v|*v)); v } )); } } diff --git a/gen/identitytoolkit3/src/api.rs b/gen/identitytoolkit3/src/api.rs index dc9b455671..c1cc9a9a6f 100644 --- a/gen/identitytoolkit3/src/api.rs +++ b/gen/identitytoolkit3/src/api.rs @@ -2277,25 +2277,15 @@ impl<'a, C> RelyingpartyCreateAuthUriCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2303,13 +2293,15 @@ impl<'a, C> RelyingpartyCreateAuthUriCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2533,25 +2525,15 @@ impl<'a, C> RelyingpartyDeleteAccountCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2559,13 +2541,15 @@ impl<'a, C> RelyingpartyDeleteAccountCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2789,25 +2773,15 @@ impl<'a, C> RelyingpartyDownloadAccountCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2815,13 +2789,15 @@ impl<'a, C> RelyingpartyDownloadAccountCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3045,25 +3021,15 @@ impl<'a, C> RelyingpartyEmailLinkSigninCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3071,13 +3037,15 @@ impl<'a, C> RelyingpartyEmailLinkSigninCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3301,25 +3269,15 @@ impl<'a, C> RelyingpartyGetAccountInfoCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3327,13 +3285,15 @@ impl<'a, C> RelyingpartyGetAccountInfoCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3557,25 +3517,15 @@ impl<'a, C> RelyingpartyGetOobConfirmationCodeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3583,13 +3533,15 @@ impl<'a, C> RelyingpartyGetOobConfirmationCodeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3802,25 +3754,15 @@ impl<'a, C> RelyingpartyGetProjectConfigCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3828,13 +3770,15 @@ impl<'a, C> RelyingpartyGetProjectConfigCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4042,25 +3986,15 @@ impl<'a, C> RelyingpartyGetPublicKeyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4068,13 +4002,15 @@ impl<'a, C> RelyingpartyGetPublicKeyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4268,25 +4204,15 @@ impl<'a, C> RelyingpartyGetRecaptchaParamCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4294,13 +4220,15 @@ impl<'a, C> RelyingpartyGetRecaptchaParamCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4515,25 +4443,15 @@ impl<'a, C> RelyingpartyResetPasswordCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4541,13 +4459,15 @@ impl<'a, C> RelyingpartyResetPasswordCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4771,25 +4691,15 @@ impl<'a, C> RelyingpartySendVerificationCodeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4797,13 +4707,15 @@ impl<'a, C> RelyingpartySendVerificationCodeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5027,25 +4939,15 @@ impl<'a, C> RelyingpartySetAccountInfoCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5053,13 +4955,15 @@ impl<'a, C> RelyingpartySetAccountInfoCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5283,25 +5187,15 @@ impl<'a, C> RelyingpartySetProjectConfigCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5309,13 +5203,15 @@ impl<'a, C> RelyingpartySetProjectConfigCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5539,25 +5435,15 @@ impl<'a, C> RelyingpartySignOutUserCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5565,13 +5451,15 @@ impl<'a, C> RelyingpartySignOutUserCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5795,25 +5683,15 @@ impl<'a, C> RelyingpartySignupNewUserCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5821,13 +5699,15 @@ impl<'a, C> RelyingpartySignupNewUserCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6051,25 +5931,15 @@ impl<'a, C> RelyingpartyUploadAccountCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6077,13 +5947,15 @@ impl<'a, C> RelyingpartyUploadAccountCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6307,25 +6179,15 @@ impl<'a, C> RelyingpartyVerifyAssertionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6333,13 +6195,15 @@ impl<'a, C> RelyingpartyVerifyAssertionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6563,25 +6427,15 @@ impl<'a, C> RelyingpartyVerifyCustomTokenCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6589,13 +6443,15 @@ impl<'a, C> RelyingpartyVerifyCustomTokenCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6819,25 +6675,15 @@ impl<'a, C> RelyingpartyVerifyPasswordCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6845,13 +6691,15 @@ impl<'a, C> RelyingpartyVerifyPasswordCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7075,25 +6923,15 @@ impl<'a, C> RelyingpartyVerifyPhoneNumberCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7101,13 +6939,15 @@ impl<'a, C> RelyingpartyVerifyPhoneNumberCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/identitytoolkit3/src/client.rs b/gen/identitytoolkit3/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/identitytoolkit3/src/client.rs +++ b/gen/identitytoolkit3/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/indexing3/src/api.rs b/gen/indexing3/src/api.rs index fe0aa2ea4b..a06e7d6048 100644 --- a/gen/indexing3/src/api.rs +++ b/gen/indexing3/src/api.rs @@ -433,25 +433,15 @@ impl<'a, C> UrlNotificationGetMetadataCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -459,13 +449,15 @@ impl<'a, C> UrlNotificationGetMetadataCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -691,25 +683,15 @@ impl<'a, C> UrlNotificationPublishCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -717,13 +699,15 @@ impl<'a, C> UrlNotificationPublishCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/indexing3/src/client.rs b/gen/indexing3/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/indexing3/src/client.rs +++ b/gen/indexing3/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/jobs3-cli/src/main.rs b/gen/jobs3-cli/src/main.rs index edc6b66424..8c3bf9d85a 100644 --- a/gen/jobs3-cli/src/main.rs +++ b/gen/jobs3-cli/src/main.rs @@ -376,7 +376,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["require-open-jobs", "page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "require-open-jobs"].iter().map(|v|*v)); v } )); } } @@ -562,7 +562,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["language-codes", "page-size", "query", "scope", "language-code", "type", "company-name"].iter().map(|v|*v)); + v.extend(["company-name", "language-code", "language-codes", "page-size", "query", "scope", "type"].iter().map(|v|*v)); v } )); } } @@ -943,7 +943,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "job-view", "filter"].iter().map(|v|*v)); + v.extend(["filter", "job-view", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/jobs3/src/api.rs b/gen/jobs3/src/api.rs index 485b270545..c1b375509e 100644 --- a/gen/jobs3/src/api.rs +++ b/gen/jobs3/src/api.rs @@ -1892,25 +1892,15 @@ impl<'a, C> ProjectClientEventCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1918,13 +1908,15 @@ impl<'a, C> ProjectClientEventCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2189,25 +2181,15 @@ impl<'a, C> ProjectCompanyCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2215,13 +2197,15 @@ impl<'a, C> ProjectCompanyCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2465,25 +2449,15 @@ impl<'a, C> ProjectCompanyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2491,13 +2465,15 @@ impl<'a, C> ProjectCompanyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2732,25 +2708,15 @@ impl<'a, C> ProjectCompanyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2758,13 +2724,15 @@ impl<'a, C> ProjectCompanyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3014,25 +2982,15 @@ impl<'a, C> ProjectCompanyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3040,13 +2998,15 @@ impl<'a, C> ProjectCompanyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3323,25 +3283,15 @@ impl<'a, C> ProjectCompanyPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3349,13 +3299,15 @@ impl<'a, C> ProjectCompanyPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3620,25 +3572,15 @@ impl<'a, C> ProjectJobBatchDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3646,13 +3588,15 @@ impl<'a, C> ProjectJobBatchDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3917,25 +3861,15 @@ impl<'a, C> ProjectJobCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3943,13 +3877,15 @@ impl<'a, C> ProjectJobCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4193,25 +4129,15 @@ impl<'a, C> ProjectJobDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4219,13 +4145,15 @@ impl<'a, C> ProjectJobDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4460,25 +4388,15 @@ impl<'a, C> ProjectJobGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4486,13 +4404,15 @@ impl<'a, C> ProjectJobGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4747,25 +4667,15 @@ impl<'a, C> ProjectJobListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4773,13 +4683,15 @@ impl<'a, C> ProjectJobListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5063,25 +4975,15 @@ impl<'a, C> ProjectJobPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5089,13 +4991,15 @@ impl<'a, C> ProjectJobPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5360,25 +5264,15 @@ impl<'a, C> ProjectJobSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5386,13 +5280,15 @@ impl<'a, C> ProjectJobSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5657,25 +5553,15 @@ impl<'a, C> ProjectJobSearchForAlertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5683,13 +5569,15 @@ impl<'a, C> ProjectJobSearchForAlertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5970,25 +5858,15 @@ impl<'a, C> ProjectCompleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5996,13 +5874,15 @@ impl<'a, C> ProjectCompleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/jobs3/src/client.rs b/gen/jobs3/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/jobs3/src/client.rs +++ b/gen/jobs3/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/jobs4-cli/src/main.rs b/gen/jobs4-cli/src/main.rs index 52dbb3023d..5647b24489 100644 --- a/gen/jobs4-cli/src/main.rs +++ b/gen/jobs4-cli/src/main.rs @@ -427,7 +427,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "require-open-jobs"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "require-open-jobs"].iter().map(|v|*v)); v } )); } } @@ -613,7 +613,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["scope", "query", "type", "company", "page-size", "language-codes"].iter().map(|v|*v)); + v.extend(["company", "language-codes", "page-size", "query", "scope", "type"].iter().map(|v|*v)); v } )); } } @@ -1353,7 +1353,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "job-view", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "job-view", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1807,7 +1807,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/jobs4/src/api.rs b/gen/jobs4/src/api.rs index 1ffe16e371..cb15fe73e4 100644 --- a/gen/jobs4/src/api.rs +++ b/gen/jobs4/src/api.rs @@ -1915,25 +1915,15 @@ impl<'a, C> ProjectOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1941,13 +1931,15 @@ impl<'a, C> ProjectOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2203,25 +2195,15 @@ impl<'a, C> ProjectTenantClientEventCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2229,13 +2211,15 @@ impl<'a, C> ProjectTenantClientEventCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2500,25 +2484,15 @@ impl<'a, C> ProjectTenantCompanyCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2526,13 +2500,15 @@ impl<'a, C> ProjectTenantCompanyCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2776,25 +2752,15 @@ impl<'a, C> ProjectTenantCompanyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2802,13 +2768,15 @@ impl<'a, C> ProjectTenantCompanyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3043,25 +3011,15 @@ impl<'a, C> ProjectTenantCompanyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3069,13 +3027,15 @@ impl<'a, C> ProjectTenantCompanyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3325,25 +3285,15 @@ impl<'a, C> ProjectTenantCompanyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3351,13 +3301,15 @@ impl<'a, C> ProjectTenantCompanyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3639,25 +3591,15 @@ impl<'a, C> ProjectTenantCompanyPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3665,13 +3607,15 @@ impl<'a, C> ProjectTenantCompanyPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3943,25 +3887,15 @@ impl<'a, C> ProjectTenantJobBatchCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3969,13 +3903,15 @@ impl<'a, C> ProjectTenantJobBatchCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4240,25 +4176,15 @@ impl<'a, C> ProjectTenantJobBatchDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4266,13 +4192,15 @@ impl<'a, C> ProjectTenantJobBatchDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4537,25 +4465,15 @@ impl<'a, C> ProjectTenantJobBatchUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4563,13 +4481,15 @@ impl<'a, C> ProjectTenantJobBatchUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4834,25 +4754,15 @@ impl<'a, C> ProjectTenantJobCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4860,13 +4770,15 @@ impl<'a, C> ProjectTenantJobCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5110,25 +5022,15 @@ impl<'a, C> ProjectTenantJobDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5136,13 +5038,15 @@ impl<'a, C> ProjectTenantJobDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5377,25 +5281,15 @@ impl<'a, C> ProjectTenantJobGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5403,13 +5297,15 @@ impl<'a, C> ProjectTenantJobGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5664,25 +5560,15 @@ impl<'a, C> ProjectTenantJobListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5690,13 +5576,15 @@ impl<'a, C> ProjectTenantJobListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5985,25 +5873,15 @@ impl<'a, C> ProjectTenantJobPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6011,13 +5889,15 @@ impl<'a, C> ProjectTenantJobPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6289,25 +6169,15 @@ impl<'a, C> ProjectTenantJobSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6315,13 +6185,15 @@ impl<'a, C> ProjectTenantJobSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6586,25 +6458,15 @@ impl<'a, C> ProjectTenantJobSearchForAlertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6612,13 +6474,15 @@ impl<'a, C> ProjectTenantJobSearchForAlertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6894,25 +6758,15 @@ impl<'a, C> ProjectTenantCompleteQueryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6920,13 +6774,15 @@ impl<'a, C> ProjectTenantCompleteQueryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7225,25 +7081,15 @@ impl<'a, C> ProjectTenantCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7251,13 +7097,15 @@ impl<'a, C> ProjectTenantCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7501,25 +7349,15 @@ impl<'a, C> ProjectTenantDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7527,13 +7365,15 @@ impl<'a, C> ProjectTenantDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7768,25 +7608,15 @@ impl<'a, C> ProjectTenantGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7794,13 +7624,15 @@ impl<'a, C> ProjectTenantGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8045,25 +7877,15 @@ impl<'a, C> ProjectTenantListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8071,13 +7893,15 @@ impl<'a, C> ProjectTenantListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8352,25 +8176,15 @@ impl<'a, C> ProjectTenantPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8378,13 +8192,15 @@ impl<'a, C> ProjectTenantPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/jobs4/src/client.rs b/gen/jobs4/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/jobs4/src/client.rs +++ b/gen/jobs4/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/language1/src/api.rs b/gen/language1/src/api.rs index 585724d16d..da9f46564f 100644 --- a/gen/language1/src/api.rs +++ b/gen/language1/src/api.rs @@ -950,25 +950,15 @@ impl<'a, C> DocumentAnalyzeEntityCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -976,13 +966,15 @@ impl<'a, C> DocumentAnalyzeEntityCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1210,25 +1202,15 @@ impl<'a, C> DocumentAnalyzeEntitySentimentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1236,13 +1218,15 @@ impl<'a, C> DocumentAnalyzeEntitySentimentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1470,25 +1454,15 @@ impl<'a, C> DocumentAnalyzeSentimentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1496,13 +1470,15 @@ impl<'a, C> DocumentAnalyzeSentimentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1730,25 +1706,15 @@ impl<'a, C> DocumentAnalyzeSyntaxCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1756,13 +1722,15 @@ impl<'a, C> DocumentAnalyzeSyntaxCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1990,25 +1958,15 @@ impl<'a, C> DocumentAnnotateTextCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2016,13 +1974,15 @@ impl<'a, C> DocumentAnnotateTextCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2250,25 +2210,15 @@ impl<'a, C> DocumentClassifyTextCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2276,13 +2226,15 @@ impl<'a, C> DocumentClassifyTextCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/language1/src/client.rs b/gen/language1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/language1/src/client.rs +++ b/gen/language1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/language1_beta1/src/api.rs b/gen/language1_beta1/src/api.rs index 3531007b5d..6d6d85d344 100644 --- a/gen/language1_beta1/src/api.rs +++ b/gen/language1_beta1/src/api.rs @@ -812,25 +812,15 @@ impl<'a, C> DocumentAnalyzeEntityCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -838,13 +828,15 @@ impl<'a, C> DocumentAnalyzeEntityCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1072,25 +1064,15 @@ impl<'a, C> DocumentAnalyzeSentimentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1098,13 +1080,15 @@ impl<'a, C> DocumentAnalyzeSentimentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1332,25 +1316,15 @@ impl<'a, C> DocumentAnalyzeSyntaxCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1358,13 +1332,15 @@ impl<'a, C> DocumentAnalyzeSyntaxCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1592,25 +1568,15 @@ impl<'a, C> DocumentAnnotateTextCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1618,13 +1584,15 @@ impl<'a, C> DocumentAnnotateTextCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/language1_beta1/src/client.rs b/gen/language1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/language1_beta1/src/client.rs +++ b/gen/language1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/libraryagent1/src/api.rs b/gen/libraryagent1/src/api.rs index 128ae136bd..9d1d7a419d 100644 --- a/gen/libraryagent1/src/api.rs +++ b/gen/libraryagent1/src/api.rs @@ -544,25 +544,15 @@ impl<'a, C> ShelveBookBorrowCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -570,13 +560,15 @@ impl<'a, C> ShelveBookBorrowCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -811,25 +803,15 @@ impl<'a, C> ShelveBookGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -837,13 +819,15 @@ impl<'a, C> ShelveBookGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1088,25 +1072,15 @@ impl<'a, C> ShelveBookListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1114,13 +1088,15 @@ impl<'a, C> ShelveBookListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1369,25 +1345,15 @@ impl<'a, C> ShelveBookReturnCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1395,13 +1361,15 @@ impl<'a, C> ShelveBookReturnCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1636,25 +1604,15 @@ impl<'a, C> ShelveGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1662,13 +1620,15 @@ impl<'a, C> ShelveGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1886,25 +1846,15 @@ impl<'a, C> ShelveListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1912,13 +1862,15 @@ impl<'a, C> ShelveListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/libraryagent1/src/client.rs b/gen/libraryagent1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/libraryagent1/src/client.rs +++ b/gen/libraryagent1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/licensing1-cli/src/main.rs b/gen/licensing1-cli/src/main.rs index 6343c98a0b..2635ec3848 100644 --- a/gen/licensing1-cli/src/main.rs +++ b/gen/licensing1-cli/src/main.rs @@ -256,7 +256,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -315,7 +315,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/licensing1/src/api.rs b/gen/licensing1/src/api.rs index 41fd87056e..f3b0fe718a 100644 --- a/gen/licensing1/src/api.rs +++ b/gen/licensing1/src/api.rs @@ -616,25 +616,15 @@ impl<'a, C> LicenseAssignmentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -642,13 +632,15 @@ impl<'a, C> LicenseAssignmentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -903,25 +895,15 @@ impl<'a, C> LicenseAssignmentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -929,13 +911,15 @@ impl<'a, C> LicenseAssignmentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1209,25 +1193,15 @@ impl<'a, C> LicenseAssignmentInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1235,13 +1209,15 @@ impl<'a, C> LicenseAssignmentInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1503,25 +1479,15 @@ impl<'a, C> LicenseAssignmentListForProductCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1529,13 +1495,15 @@ impl<'a, C> LicenseAssignmentListForProductCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1804,25 +1772,15 @@ impl<'a, C> LicenseAssignmentListForProductAndSkuCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1830,13 +1788,15 @@ impl<'a, C> LicenseAssignmentListForProductAndSkuCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2126,25 +2086,15 @@ impl<'a, C> LicenseAssignmentPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2152,13 +2102,15 @@ impl<'a, C> LicenseAssignmentPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2443,25 +2395,15 @@ impl<'a, C> LicenseAssignmentUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2469,13 +2411,15 @@ impl<'a, C> LicenseAssignmentUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/licensing1/src/client.rs b/gen/licensing1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/licensing1/src/client.rs +++ b/gen/licensing1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/lifesciences2_beta/src/api.rs b/gen/lifesciences2_beta/src/api.rs index 58555afde0..f2a5bea9f7 100644 --- a/gen/lifesciences2_beta/src/api.rs +++ b/gen/lifesciences2_beta/src/api.rs @@ -980,25 +980,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1006,13 +996,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1256,25 +1248,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1282,13 +1264,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1538,25 +1522,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1564,13 +1538,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1847,25 +1823,15 @@ impl<'a, C> ProjectLocationPipelineRunCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1873,13 +1839,15 @@ impl<'a, C> ProjectLocationPipelineRunCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2123,25 +2091,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2149,13 +2107,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2405,25 +2365,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2431,13 +2381,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/lifesciences2_beta/src/client.rs b/gen/lifesciences2_beta/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/lifesciences2_beta/src/client.rs +++ b/gen/lifesciences2_beta/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/localservices1-cli/src/main.rs b/gen/localservices1-cli/src/main.rs index 3d77ba0749..661c991f32 100644 --- a/gen/localservices1-cli/src/main.rs +++ b/gen/localservices1-cli/src/main.rs @@ -88,7 +88,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "start-date-month", "end-date-month", "start-date-year", "end-date-year", "end-date-day", "page-token", "query", "start-date-day"].iter().map(|v|*v)); + v.extend(["end-date-day", "end-date-month", "end-date-year", "page-size", "page-token", "query", "start-date-day", "start-date-month", "start-date-year"].iter().map(|v|*v)); v } )); } } @@ -168,7 +168,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "start-date-month", "end-date-month", "start-date-year", "end-date-year", "end-date-day", "page-token", "query", "start-date-day"].iter().map(|v|*v)); + v.extend(["end-date-day", "end-date-month", "end-date-year", "page-size", "page-token", "query", "start-date-day", "start-date-month", "start-date-year"].iter().map(|v|*v)); v } )); } } diff --git a/gen/localservices1/src/api.rs b/gen/localservices1/src/api.rs index 83f60da6a8..51f872b77b 100644 --- a/gen/localservices1/src/api.rs +++ b/gen/localservices1/src/api.rs @@ -702,25 +702,15 @@ impl<'a, C> AccountReportSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -728,13 +718,15 @@ impl<'a, C> AccountReportSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1040,25 +1032,15 @@ impl<'a, C> DetailedLeadReportSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1066,13 +1048,15 @@ impl<'a, C> DetailedLeadReportSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/localservices1/src/client.rs b/gen/localservices1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/localservices1/src/client.rs +++ b/gen/localservices1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/logging2-cli/src/main.rs b/gen/logging2-cli/src/main.rs index fa5a3bd959..1599b812de 100644 --- a/gen/logging2-cli/src/main.rs +++ b/gen/logging2-cli/src/main.rs @@ -1255,7 +1255,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1369,7 +1369,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "resource-names", "page-token"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "resource-names"].iter().map(|v|*v)); v } )); } } @@ -3699,7 +3699,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3813,7 +3813,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "resource-names", "page-token"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "resource-names"].iter().map(|v|*v)); v } )); } } @@ -5182,7 +5182,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -5296,7 +5296,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "resource-names", "page-token"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "resource-names"].iter().map(|v|*v)); v } )); } } @@ -6797,7 +6797,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -6911,7 +6911,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "resource-names", "page-token"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "resource-names"].iter().map(|v|*v)); v } )); } } @@ -8718,7 +8718,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -8832,7 +8832,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "resource-names", "page-token"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "resource-names"].iter().map(|v|*v)); v } )); } } diff --git a/gen/logging2/src/api.rs b/gen/logging2/src/api.rs index 72cb4a3fd5..77627d0fe8 100644 --- a/gen/logging2/src/api.rs +++ b/gen/logging2/src/api.rs @@ -4586,25 +4586,15 @@ impl<'a, C> BillingAccountBucketViewGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4612,13 +4602,15 @@ impl<'a, C> BillingAccountBucketViewGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4853,25 +4845,15 @@ impl<'a, C> BillingAccountBucketGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4879,13 +4861,15 @@ impl<'a, C> BillingAccountBucketGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5141,25 +5125,15 @@ impl<'a, C> BillingAccountExclusionCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5167,13 +5141,15 @@ impl<'a, C> BillingAccountExclusionCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5417,25 +5393,15 @@ impl<'a, C> BillingAccountExclusionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5443,13 +5409,15 @@ impl<'a, C> BillingAccountExclusionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5684,25 +5652,15 @@ impl<'a, C> BillingAccountExclusionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5710,13 +5668,15 @@ impl<'a, C> BillingAccountExclusionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5961,25 +5921,15 @@ impl<'a, C> BillingAccountExclusionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5987,13 +5937,15 @@ impl<'a, C> BillingAccountExclusionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6268,25 +6220,15 @@ impl<'a, C> BillingAccountExclusionPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6294,13 +6236,15 @@ impl<'a, C> BillingAccountExclusionPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6577,25 +6521,15 @@ impl<'a, C> BillingAccountLocationBucketViewCreateCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6603,13 +6537,15 @@ impl<'a, C> BillingAccountLocationBucketViewCreateCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6860,25 +6796,15 @@ impl<'a, C> BillingAccountLocationBucketViewDeleteCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6886,13 +6812,15 @@ impl<'a, C> BillingAccountLocationBucketViewDeleteCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7137,25 +7065,15 @@ impl<'a, C> BillingAccountLocationBucketViewListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7163,13 +7081,15 @@ impl<'a, C> BillingAccountLocationBucketViewListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7444,25 +7364,15 @@ impl<'a, C> BillingAccountLocationBucketViewPatchCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7470,13 +7380,15 @@ impl<'a, C> BillingAccountLocationBucketViewPatchCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7753,25 +7665,15 @@ impl<'a, C> BillingAccountLocationBucketCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7779,13 +7681,15 @@ impl<'a, C> BillingAccountLocationBucketCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8036,25 +7940,15 @@ impl<'a, C> BillingAccountLocationBucketDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8062,13 +7956,15 @@ impl<'a, C> BillingAccountLocationBucketDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8313,25 +8209,15 @@ impl<'a, C> BillingAccountLocationBucketListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8339,13 +8225,15 @@ impl<'a, C> BillingAccountLocationBucketListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8620,25 +8508,15 @@ impl<'a, C> BillingAccountLocationBucketPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8646,13 +8524,15 @@ impl<'a, C> BillingAccountLocationBucketPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8924,25 +8804,15 @@ impl<'a, C> BillingAccountLocationBucketUndeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8950,13 +8820,15 @@ impl<'a, C> BillingAccountLocationBucketUndeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9200,25 +9072,15 @@ impl<'a, C> BillingAccountLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9226,13 +9088,15 @@ impl<'a, C> BillingAccountLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9482,25 +9346,15 @@ impl<'a, C> BillingAccountLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9508,13 +9362,15 @@ impl<'a, C> BillingAccountLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9770,25 +9626,15 @@ impl<'a, C> BillingAccountLogDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9796,13 +9642,15 @@ impl<'a, C> BillingAccountLogDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10054,25 +9902,15 @@ impl<'a, C> BillingAccountLogListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10080,13 +9918,15 @@ impl<'a, C> BillingAccountLogListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10369,25 +10209,15 @@ impl<'a, C> BillingAccountSinkCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10395,13 +10225,15 @@ impl<'a, C> BillingAccountSinkCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10652,25 +10484,15 @@ impl<'a, C> BillingAccountSinkDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10678,13 +10500,15 @@ impl<'a, C> BillingAccountSinkDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10919,25 +10743,15 @@ impl<'a, C> BillingAccountSinkGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10945,13 +10759,15 @@ impl<'a, C> BillingAccountSinkGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11196,25 +11012,15 @@ impl<'a, C> BillingAccountSinkListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11222,13 +11028,15 @@ impl<'a, C> BillingAccountSinkListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11508,25 +11316,15 @@ impl<'a, C> BillingAccountSinkPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11534,13 +11332,15 @@ impl<'a, C> BillingAccountSinkPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11829,25 +11629,15 @@ impl<'a, C> BillingAccountSinkUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11855,13 +11645,15 @@ impl<'a, C> BillingAccountSinkUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12113,25 +11905,15 @@ impl<'a, C> EntryListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12139,13 +11921,15 @@ impl<'a, C> EntryListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12373,25 +12157,15 @@ impl<'a, C> EntryTailCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12399,13 +12173,15 @@ impl<'a, C> EntryTailCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12633,25 +12409,15 @@ impl<'a, C> EntryWriteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12659,13 +12425,15 @@ impl<'a, C> EntryWriteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12920,25 +12688,15 @@ impl<'a, C> ExclusionCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12946,13 +12704,15 @@ impl<'a, C> ExclusionCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13196,25 +12956,15 @@ impl<'a, C> ExclusionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13222,13 +12972,15 @@ impl<'a, C> ExclusionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13463,25 +13215,15 @@ impl<'a, C> ExclusionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13489,13 +13231,15 @@ impl<'a, C> ExclusionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13740,25 +13484,15 @@ impl<'a, C> ExclusionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13766,13 +13500,15 @@ impl<'a, C> ExclusionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14047,25 +13783,15 @@ impl<'a, C> ExclusionPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14073,13 +13799,15 @@ impl<'a, C> ExclusionPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14351,25 +14079,15 @@ impl<'a, C> FolderExclusionCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14377,13 +14095,15 @@ impl<'a, C> FolderExclusionCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14627,25 +14347,15 @@ impl<'a, C> FolderExclusionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14653,13 +14363,15 @@ impl<'a, C> FolderExclusionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14894,25 +14606,15 @@ impl<'a, C> FolderExclusionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14920,13 +14622,15 @@ impl<'a, C> FolderExclusionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15171,25 +14875,15 @@ impl<'a, C> FolderExclusionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15197,13 +14891,15 @@ impl<'a, C> FolderExclusionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15478,25 +15174,15 @@ impl<'a, C> FolderExclusionPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15504,13 +15190,15 @@ impl<'a, C> FolderExclusionPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15787,25 +15475,15 @@ impl<'a, C> FolderLocationBucketViewCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15813,13 +15491,15 @@ impl<'a, C> FolderLocationBucketViewCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16070,25 +15750,15 @@ impl<'a, C> FolderLocationBucketViewDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16096,13 +15766,15 @@ impl<'a, C> FolderLocationBucketViewDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16337,25 +16009,15 @@ impl<'a, C> FolderLocationBucketViewGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16363,13 +16025,15 @@ impl<'a, C> FolderLocationBucketViewGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16614,25 +16278,15 @@ impl<'a, C> FolderLocationBucketViewListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16640,13 +16294,15 @@ impl<'a, C> FolderLocationBucketViewListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16921,25 +16577,15 @@ impl<'a, C> FolderLocationBucketViewPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16947,13 +16593,15 @@ impl<'a, C> FolderLocationBucketViewPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17230,25 +16878,15 @@ impl<'a, C> FolderLocationBucketCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17256,13 +16894,15 @@ impl<'a, C> FolderLocationBucketCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17513,25 +17153,15 @@ impl<'a, C> FolderLocationBucketDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17539,13 +17169,15 @@ impl<'a, C> FolderLocationBucketDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17780,25 +17412,15 @@ impl<'a, C> FolderLocationBucketGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17806,13 +17428,15 @@ impl<'a, C> FolderLocationBucketGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18057,25 +17681,15 @@ impl<'a, C> FolderLocationBucketListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18083,13 +17697,15 @@ impl<'a, C> FolderLocationBucketListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18364,25 +17980,15 @@ impl<'a, C> FolderLocationBucketPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18390,13 +17996,15 @@ impl<'a, C> FolderLocationBucketPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18668,25 +18276,15 @@ impl<'a, C> FolderLocationBucketUndeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18694,13 +18292,15 @@ impl<'a, C> FolderLocationBucketUndeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18944,25 +18544,15 @@ impl<'a, C> FolderLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18970,13 +18560,15 @@ impl<'a, C> FolderLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19226,25 +18818,15 @@ impl<'a, C> FolderLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19252,13 +18834,15 @@ impl<'a, C> FolderLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19514,25 +19098,15 @@ impl<'a, C> FolderLogDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19540,13 +19114,15 @@ impl<'a, C> FolderLogDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19798,25 +19374,15 @@ impl<'a, C> FolderLogListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19824,13 +19390,15 @@ impl<'a, C> FolderLogListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20113,25 +19681,15 @@ impl<'a, C> FolderSinkCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20139,13 +19697,15 @@ impl<'a, C> FolderSinkCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20396,25 +19956,15 @@ impl<'a, C> FolderSinkDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20422,13 +19972,15 @@ impl<'a, C> FolderSinkDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20663,25 +20215,15 @@ impl<'a, C> FolderSinkGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20689,13 +20231,15 @@ impl<'a, C> FolderSinkGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20940,25 +20484,15 @@ impl<'a, C> FolderSinkListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20966,13 +20500,15 @@ impl<'a, C> FolderSinkListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21252,25 +20788,15 @@ impl<'a, C> FolderSinkPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21278,13 +20804,15 @@ impl<'a, C> FolderSinkPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21573,25 +21101,15 @@ impl<'a, C> FolderSinkUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21599,13 +21117,15 @@ impl<'a, C> FolderSinkUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21889,25 +21409,15 @@ impl<'a, C> LocationBucketViewCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21915,13 +21425,15 @@ impl<'a, C> LocationBucketViewCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22172,25 +21684,15 @@ impl<'a, C> LocationBucketViewDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22198,13 +21700,15 @@ impl<'a, C> LocationBucketViewDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22439,25 +21943,15 @@ impl<'a, C> LocationBucketViewGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22465,13 +21959,15 @@ impl<'a, C> LocationBucketViewGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22716,25 +22212,15 @@ impl<'a, C> LocationBucketViewListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22742,13 +22228,15 @@ impl<'a, C> LocationBucketViewListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23023,25 +22511,15 @@ impl<'a, C> LocationBucketViewPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23049,13 +22527,15 @@ impl<'a, C> LocationBucketViewPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23332,25 +22812,15 @@ impl<'a, C> LocationBucketCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23358,13 +22828,15 @@ impl<'a, C> LocationBucketCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23615,25 +23087,15 @@ impl<'a, C> LocationBucketDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23641,13 +23103,15 @@ impl<'a, C> LocationBucketDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23882,25 +23346,15 @@ impl<'a, C> LocationBucketGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23908,13 +23362,15 @@ impl<'a, C> LocationBucketGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24159,25 +23615,15 @@ impl<'a, C> LocationBucketListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24185,13 +23631,15 @@ impl<'a, C> LocationBucketListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24466,25 +23914,15 @@ impl<'a, C> LocationBucketPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24492,13 +23930,15 @@ impl<'a, C> LocationBucketPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24770,25 +24210,15 @@ impl<'a, C> LocationBucketUndeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24796,13 +24226,15 @@ impl<'a, C> LocationBucketUndeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25046,25 +24478,15 @@ impl<'a, C> LocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25072,13 +24494,15 @@ impl<'a, C> LocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25328,25 +24752,15 @@ impl<'a, C> LocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25354,13 +24768,15 @@ impl<'a, C> LocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25616,25 +25032,15 @@ impl<'a, C> LogDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25642,13 +25048,15 @@ impl<'a, C> LogDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25900,25 +25308,15 @@ impl<'a, C> LogListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25926,13 +25324,15 @@ impl<'a, C> LogListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26172,25 +25572,15 @@ impl<'a, C> MonitoredResourceDescriptorListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26198,13 +25588,15 @@ impl<'a, C> MonitoredResourceDescriptorListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26464,25 +25856,15 @@ impl<'a, C> OrganizationExclusionCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26490,13 +25872,15 @@ impl<'a, C> OrganizationExclusionCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26740,25 +26124,15 @@ impl<'a, C> OrganizationExclusionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26766,13 +26140,15 @@ impl<'a, C> OrganizationExclusionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27007,25 +26383,15 @@ impl<'a, C> OrganizationExclusionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27033,13 +26399,15 @@ impl<'a, C> OrganizationExclusionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27284,25 +26652,15 @@ impl<'a, C> OrganizationExclusionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27310,13 +26668,15 @@ impl<'a, C> OrganizationExclusionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27591,25 +26951,15 @@ impl<'a, C> OrganizationExclusionPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27617,13 +26967,15 @@ impl<'a, C> OrganizationExclusionPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27900,25 +27252,15 @@ impl<'a, C> OrganizationLocationBucketViewCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27926,13 +27268,15 @@ impl<'a, C> OrganizationLocationBucketViewCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28183,25 +27527,15 @@ impl<'a, C> OrganizationLocationBucketViewDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28209,13 +27543,15 @@ impl<'a, C> OrganizationLocationBucketViewDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28450,25 +27786,15 @@ impl<'a, C> OrganizationLocationBucketViewGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28476,13 +27802,15 @@ impl<'a, C> OrganizationLocationBucketViewGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28727,25 +28055,15 @@ impl<'a, C> OrganizationLocationBucketViewListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28753,13 +28071,15 @@ impl<'a, C> OrganizationLocationBucketViewListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29034,25 +28354,15 @@ impl<'a, C> OrganizationLocationBucketViewPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29060,13 +28370,15 @@ impl<'a, C> OrganizationLocationBucketViewPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29343,25 +28655,15 @@ impl<'a, C> OrganizationLocationBucketCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29369,13 +28671,15 @@ impl<'a, C> OrganizationLocationBucketCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29626,25 +28930,15 @@ impl<'a, C> OrganizationLocationBucketDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29652,13 +28946,15 @@ impl<'a, C> OrganizationLocationBucketDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29893,25 +29189,15 @@ impl<'a, C> OrganizationLocationBucketGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29919,13 +29205,15 @@ impl<'a, C> OrganizationLocationBucketGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30170,25 +29458,15 @@ impl<'a, C> OrganizationLocationBucketListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30196,13 +29474,15 @@ impl<'a, C> OrganizationLocationBucketListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30477,25 +29757,15 @@ impl<'a, C> OrganizationLocationBucketPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30503,13 +29773,15 @@ impl<'a, C> OrganizationLocationBucketPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30781,25 +30053,15 @@ impl<'a, C> OrganizationLocationBucketUndeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30807,13 +30069,15 @@ impl<'a, C> OrganizationLocationBucketUndeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31057,25 +30321,15 @@ impl<'a, C> OrganizationLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31083,13 +30337,15 @@ impl<'a, C> OrganizationLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31339,25 +30595,15 @@ impl<'a, C> OrganizationLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31365,13 +30611,15 @@ impl<'a, C> OrganizationLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31627,25 +30875,15 @@ impl<'a, C> OrganizationLogDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31653,13 +30891,15 @@ impl<'a, C> OrganizationLogDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31911,25 +31151,15 @@ impl<'a, C> OrganizationLogListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31937,13 +31167,15 @@ impl<'a, C> OrganizationLogListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32226,25 +31458,15 @@ impl<'a, C> OrganizationSinkCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32252,13 +31474,15 @@ impl<'a, C> OrganizationSinkCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32509,25 +31733,15 @@ impl<'a, C> OrganizationSinkDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32535,13 +31749,15 @@ impl<'a, C> OrganizationSinkDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -32776,25 +31992,15 @@ impl<'a, C> OrganizationSinkGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -32802,13 +32008,15 @@ impl<'a, C> OrganizationSinkGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33053,25 +32261,15 @@ impl<'a, C> OrganizationSinkListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33079,13 +32277,15 @@ impl<'a, C> OrganizationSinkListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33365,25 +32565,15 @@ impl<'a, C> OrganizationSinkPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33391,13 +32581,15 @@ impl<'a, C> OrganizationSinkPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33686,25 +32878,15 @@ impl<'a, C> OrganizationSinkUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -33712,13 +32894,15 @@ impl<'a, C> OrganizationSinkUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -33976,25 +33160,15 @@ impl<'a, C> OrganizationGetCmekSettingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34002,13 +33176,15 @@ impl<'a, C> OrganizationGetCmekSettingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34269,25 +33445,15 @@ impl<'a, C> OrganizationUpdateCmekSettingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34295,13 +33461,15 @@ impl<'a, C> OrganizationUpdateCmekSettingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34573,25 +33741,15 @@ impl<'a, C> ProjectExclusionCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34599,13 +33757,15 @@ impl<'a, C> ProjectExclusionCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -34849,25 +34009,15 @@ impl<'a, C> ProjectExclusionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -34875,13 +34025,15 @@ impl<'a, C> ProjectExclusionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35116,25 +34268,15 @@ impl<'a, C> ProjectExclusionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35142,13 +34284,15 @@ impl<'a, C> ProjectExclusionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35393,25 +34537,15 @@ impl<'a, C> ProjectExclusionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35419,13 +34553,15 @@ impl<'a, C> ProjectExclusionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -35700,25 +34836,15 @@ impl<'a, C> ProjectExclusionPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -35726,13 +34852,15 @@ impl<'a, C> ProjectExclusionPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36009,25 +35137,15 @@ impl<'a, C> ProjectLocationBucketViewCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36035,13 +35153,15 @@ impl<'a, C> ProjectLocationBucketViewCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36292,25 +35412,15 @@ impl<'a, C> ProjectLocationBucketViewDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36318,13 +35428,15 @@ impl<'a, C> ProjectLocationBucketViewDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36559,25 +35671,15 @@ impl<'a, C> ProjectLocationBucketViewGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36585,13 +35687,15 @@ impl<'a, C> ProjectLocationBucketViewGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -36836,25 +35940,15 @@ impl<'a, C> ProjectLocationBucketViewListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -36862,13 +35956,15 @@ impl<'a, C> ProjectLocationBucketViewListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37143,25 +36239,15 @@ impl<'a, C> ProjectLocationBucketViewPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37169,13 +36255,15 @@ impl<'a, C> ProjectLocationBucketViewPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37452,25 +36540,15 @@ impl<'a, C> ProjectLocationBucketCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37478,13 +36556,15 @@ impl<'a, C> ProjectLocationBucketCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -37735,25 +36815,15 @@ impl<'a, C> ProjectLocationBucketDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -37761,13 +36831,15 @@ impl<'a, C> ProjectLocationBucketDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38002,25 +37074,15 @@ impl<'a, C> ProjectLocationBucketGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38028,13 +37090,15 @@ impl<'a, C> ProjectLocationBucketGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38279,25 +37343,15 @@ impl<'a, C> ProjectLocationBucketListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38305,13 +37359,15 @@ impl<'a, C> ProjectLocationBucketListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38586,25 +37642,15 @@ impl<'a, C> ProjectLocationBucketPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38612,13 +37658,15 @@ impl<'a, C> ProjectLocationBucketPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -38890,25 +37938,15 @@ impl<'a, C> ProjectLocationBucketUndeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -38916,13 +37954,15 @@ impl<'a, C> ProjectLocationBucketUndeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39166,25 +38206,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39192,13 +38222,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39448,25 +38480,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39474,13 +38496,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -39736,25 +38760,15 @@ impl<'a, C> ProjectLogDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -39762,13 +38776,15 @@ impl<'a, C> ProjectLogDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40020,25 +39036,15 @@ impl<'a, C> ProjectLogListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40046,13 +39052,15 @@ impl<'a, C> ProjectLogListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40330,25 +39338,15 @@ impl<'a, C> ProjectMetricCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40356,13 +39354,15 @@ impl<'a, C> ProjectMetricCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40606,25 +39606,15 @@ impl<'a, C> ProjectMetricDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40632,13 +39622,15 @@ impl<'a, C> ProjectMetricDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -40873,25 +39865,15 @@ impl<'a, C> ProjectMetricGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -40899,13 +39881,15 @@ impl<'a, C> ProjectMetricGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41150,25 +40134,15 @@ impl<'a, C> ProjectMetricListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41176,13 +40150,15 @@ impl<'a, C> ProjectMetricListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41452,25 +40428,15 @@ impl<'a, C> ProjectMetricUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41478,13 +40444,15 @@ impl<'a, C> ProjectMetricUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -41754,25 +40722,15 @@ impl<'a, C> ProjectSinkCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -41780,13 +40738,15 @@ impl<'a, C> ProjectSinkCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42037,25 +40997,15 @@ impl<'a, C> ProjectSinkDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42063,13 +41013,15 @@ impl<'a, C> ProjectSinkDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42304,25 +41256,15 @@ impl<'a, C> ProjectSinkGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42330,13 +41272,15 @@ impl<'a, C> ProjectSinkGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42581,25 +41525,15 @@ impl<'a, C> ProjectSinkListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42607,13 +41541,15 @@ impl<'a, C> ProjectSinkListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -42893,25 +41829,15 @@ impl<'a, C> ProjectSinkPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -42919,13 +41845,15 @@ impl<'a, C> ProjectSinkPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43214,25 +42142,15 @@ impl<'a, C> ProjectSinkUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43240,13 +42158,15 @@ impl<'a, C> ProjectSinkUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43530,25 +42450,15 @@ impl<'a, C> SinkCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43556,13 +42466,15 @@ impl<'a, C> SinkCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -43813,25 +42725,15 @@ impl<'a, C> SinkDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -43839,13 +42741,15 @@ impl<'a, C> SinkDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44080,25 +42984,15 @@ impl<'a, C> SinkGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44106,13 +43000,15 @@ impl<'a, C> SinkGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44357,25 +43253,15 @@ impl<'a, C> SinkListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44383,13 +43269,15 @@ impl<'a, C> SinkListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44669,25 +43557,15 @@ impl<'a, C> SinkUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44695,13 +43573,15 @@ impl<'a, C> SinkUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -44959,25 +43839,15 @@ impl<'a, C> MethodGetCmekSettingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -44985,13 +43855,15 @@ impl<'a, C> MethodGetCmekSettingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -45252,25 +44124,15 @@ impl<'a, C> MethodUpdateCmekSettingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -45278,13 +44140,15 @@ impl<'a, C> MethodUpdateCmekSettingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/logging2/src/client.rs b/gen/logging2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/logging2/src/client.rs +++ b/gen/logging2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/logging2_beta1-cli/src/main.rs b/gen/logging2_beta1-cli/src/main.rs index 6b16d06fe7..56b7d59210 100644 --- a/gen/logging2_beta1-cli/src/main.rs +++ b/gen/logging2_beta1-cli/src/main.rs @@ -247,7 +247,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -519,7 +519,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -887,7 +887,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/logging2_beta1/src/api.rs b/gen/logging2_beta1/src/api.rs index 57d59b9087..1b1c898cd5 100644 --- a/gen/logging2_beta1/src/api.rs +++ b/gen/logging2_beta1/src/api.rs @@ -1430,25 +1430,15 @@ impl<'a, C> EntryListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1456,13 +1446,15 @@ impl<'a, C> EntryListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1690,25 +1682,15 @@ impl<'a, C> EntryWriteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1716,13 +1698,15 @@ impl<'a, C> EntryWriteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1939,25 +1923,15 @@ impl<'a, C> MonitoredResourceDescriptorListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1965,13 +1939,15 @@ impl<'a, C> MonitoredResourceDescriptorListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2231,25 +2207,15 @@ impl<'a, C> ProjectMetricCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2257,13 +2223,15 @@ impl<'a, C> ProjectMetricCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2509,25 +2477,15 @@ impl<'a, C> ProjectMetricDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2535,13 +2493,15 @@ impl<'a, C> ProjectMetricDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2778,25 +2738,15 @@ impl<'a, C> ProjectMetricGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2804,13 +2754,15 @@ impl<'a, C> ProjectMetricGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3057,25 +3009,15 @@ impl<'a, C> ProjectMetricListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3083,13 +3025,15 @@ impl<'a, C> ProjectMetricListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3361,25 +3305,15 @@ impl<'a, C> ProjectMetricUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3387,13 +3321,15 @@ impl<'a, C> ProjectMetricUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3665,25 +3601,15 @@ impl<'a, C> ProjectSinkCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3691,13 +3617,15 @@ impl<'a, C> ProjectSinkCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3953,25 +3881,15 @@ impl<'a, C> ProjectSinkDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3979,13 +3897,15 @@ impl<'a, C> ProjectSinkDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4225,25 +4145,15 @@ impl<'a, C> ProjectSinkGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4251,13 +4161,15 @@ impl<'a, C> ProjectSinkGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4507,25 +4419,15 @@ impl<'a, C> ProjectSinkListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4533,13 +4435,15 @@ impl<'a, C> ProjectSinkListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4824,25 +4728,15 @@ impl<'a, C> ProjectSinkUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4850,13 +4744,15 @@ impl<'a, C> ProjectSinkUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/logging2_beta1/src/client.rs b/gen/logging2_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/logging2_beta1/src/client.rs +++ b/gen/logging2_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/managedidentities1-cli/src/main.rs b/gen/managedidentities1-cli/src/main.rs index 2f53a1cf1c..06892caed2 100644 --- a/gen/managedidentities1-cli/src/main.rs +++ b/gen/managedidentities1-cli/src/main.rs @@ -574,7 +574,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "order-by", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1359,7 +1359,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1421,7 +1421,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/managedidentities1/src/api.rs b/gen/managedidentities1/src/api.rs index 10b5fe6f4c..9eddb20e4b 100644 --- a/gen/managedidentities1/src/api.rs +++ b/gen/managedidentities1/src/api.rs @@ -1226,25 +1226,15 @@ impl<'a, C> ProjectLocationGlobalDomainAttachTrustCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1252,13 +1242,15 @@ impl<'a, C> ProjectLocationGlobalDomainAttachTrustCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1528,25 +1520,15 @@ impl<'a, C> ProjectLocationGlobalDomainCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1554,13 +1536,15 @@ impl<'a, C> ProjectLocationGlobalDomainCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1811,25 +1795,15 @@ impl<'a, C> ProjectLocationGlobalDomainDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1837,13 +1811,15 @@ impl<'a, C> ProjectLocationGlobalDomainDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2099,25 +2075,15 @@ impl<'a, C> ProjectLocationGlobalDomainDetachTrustCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2125,13 +2091,15 @@ impl<'a, C> ProjectLocationGlobalDomainDetachTrustCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2375,25 +2343,15 @@ impl<'a, C> ProjectLocationGlobalDomainGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2401,13 +2359,15 @@ impl<'a, C> ProjectLocationGlobalDomainGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2647,25 +2607,15 @@ impl<'a, C> ProjectLocationGlobalDomainGetIamPolicyCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2673,13 +2623,15 @@ impl<'a, C> ProjectLocationGlobalDomainGetIamPolicyCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2941,25 +2893,15 @@ impl<'a, C> ProjectLocationGlobalDomainListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2967,13 +2909,15 @@ impl<'a, C> ProjectLocationGlobalDomainListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3262,25 +3206,15 @@ impl<'a, C> ProjectLocationGlobalDomainPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3288,13 +3222,15 @@ impl<'a, C> ProjectLocationGlobalDomainPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3566,25 +3502,15 @@ impl<'a, C> ProjectLocationGlobalDomainReconfigureTrustCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3592,13 +3518,15 @@ impl<'a, C> ProjectLocationGlobalDomainReconfigureTrustCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3863,25 +3791,15 @@ impl<'a, C> ProjectLocationGlobalDomainResetAdminPasswordCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3889,13 +3807,15 @@ impl<'a, C> ProjectLocationGlobalDomainResetAdminPasswordCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4160,25 +4080,15 @@ impl<'a, C> ProjectLocationGlobalDomainSetIamPolicyCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4186,13 +4096,15 @@ impl<'a, C> ProjectLocationGlobalDomainSetIamPolicyCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4457,25 +4369,15 @@ impl<'a, C> ProjectLocationGlobalDomainTestIamPermissionCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4483,13 +4385,15 @@ impl<'a, C> ProjectLocationGlobalDomainTestIamPermissionCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4754,25 +4658,15 @@ impl<'a, C> ProjectLocationGlobalDomainValidateTrustCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4780,13 +4674,15 @@ impl<'a, C> ProjectLocationGlobalDomainValidateTrustCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5051,25 +4947,15 @@ impl<'a, C> ProjectLocationGlobalOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5077,13 +4963,15 @@ impl<'a, C> ProjectLocationGlobalOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5327,25 +5215,15 @@ impl<'a, C> ProjectLocationGlobalOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5353,13 +5231,15 @@ impl<'a, C> ProjectLocationGlobalOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5594,25 +5474,15 @@ impl<'a, C> ProjectLocationGlobalOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5620,13 +5490,15 @@ impl<'a, C> ProjectLocationGlobalOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5876,25 +5748,15 @@ impl<'a, C> ProjectLocationGlobalOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5902,13 +5764,15 @@ impl<'a, C> ProjectLocationGlobalOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6164,25 +6028,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6190,13 +6044,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6446,25 +6302,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6472,13 +6318,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/managedidentities1/src/client.rs b/gen/managedidentities1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/managedidentities1/src/client.rs +++ b/gen/managedidentities1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/manager1_beta2/src/api.rs b/gen/manager1_beta2/src/api.rs index 484f5f8bf8..ac0730b7d0 100644 --- a/gen/manager1_beta2/src/api.rs +++ b/gen/manager1_beta2/src/api.rs @@ -1334,25 +1334,15 @@ impl<'a, C> DeploymentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1360,11 +1350,11 @@ impl<'a, C> DeploymentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -1606,25 +1596,15 @@ impl<'a, C> DeploymentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1632,13 +1612,15 @@ impl<'a, C> DeploymentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1905,25 +1887,15 @@ impl<'a, C> DeploymentInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1931,13 +1903,15 @@ impl<'a, C> DeploymentInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2193,25 +2167,15 @@ impl<'a, C> DeploymentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2219,13 +2183,15 @@ impl<'a, C> DeploymentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2475,25 +2441,15 @@ impl<'a, C> TemplateDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2501,11 +2457,11 @@ impl<'a, C> TemplateDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -2736,25 +2692,15 @@ impl<'a, C> TemplateGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2762,13 +2708,15 @@ impl<'a, C> TemplateGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3024,25 +2972,15 @@ impl<'a, C> TemplateInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3050,13 +2988,15 @@ impl<'a, C> TemplateInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3301,25 +3241,15 @@ impl<'a, C> TemplateListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3327,13 +3257,15 @@ impl<'a, C> TemplateListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/manager1_beta2/src/client.rs b/gen/manager1_beta2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/manager1_beta2/src/client.rs +++ b/gen/manager1_beta2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/manufacturers1-cli/src/main.rs b/gen/manufacturers1-cli/src/main.rs index 1fe7fcfc55..ce2d9b6053 100644 --- a/gen/manufacturers1-cli/src/main.rs +++ b/gen/manufacturers1-cli/src/main.rs @@ -178,7 +178,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "include"].iter().map(|v|*v)); + v.extend(["include", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/manufacturers1/src/api.rs b/gen/manufacturers1/src/api.rs index d7fa07e8a2..11337d4597 100644 --- a/gen/manufacturers1/src/api.rs +++ b/gen/manufacturers1/src/api.rs @@ -771,25 +771,15 @@ impl<'a, C> AccountProductDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -797,13 +787,15 @@ impl<'a, C> AccountProductDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1057,25 +1049,15 @@ impl<'a, C> AccountProductGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1083,13 +1065,15 @@ impl<'a, C> AccountProductGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1359,25 +1343,15 @@ impl<'a, C> AccountProductListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1385,13 +1359,15 @@ impl<'a, C> AccountProductListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1671,25 +1647,15 @@ impl<'a, C> AccountProductUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1697,13 +1663,15 @@ impl<'a, C> AccountProductUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/manufacturers1/src/client.rs b/gen/manufacturers1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/manufacturers1/src/client.rs +++ b/gen/manufacturers1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/memcache1-cli/src/main.rs b/gen/memcache1-cli/src/main.rs index 8fe3cfec05..b61a5f7951 100644 --- a/gen/memcache1-cli/src/main.rs +++ b/gen/memcache1-cli/src/main.rs @@ -419,7 +419,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "page-token", "order-by", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -672,7 +672,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -922,7 +922,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/memcache1/src/api.rs b/gen/memcache1/src/api.rs index e5de87aa38..95882626ba 100644 --- a/gen/memcache1/src/api.rs +++ b/gen/memcache1/src/api.rs @@ -974,25 +974,15 @@ impl<'a, C> ProjectLocationInstanceApplyParameterCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1000,13 +990,15 @@ impl<'a, C> ProjectLocationInstanceApplyParameterCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1276,25 +1268,15 @@ impl<'a, C> ProjectLocationInstanceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1302,13 +1284,15 @@ impl<'a, C> ProjectLocationInstanceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1559,25 +1543,15 @@ impl<'a, C> ProjectLocationInstanceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1585,13 +1559,15 @@ impl<'a, C> ProjectLocationInstanceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1826,25 +1802,15 @@ impl<'a, C> ProjectLocationInstanceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1852,13 +1818,15 @@ impl<'a, C> ProjectLocationInstanceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2113,25 +2081,15 @@ impl<'a, C> ProjectLocationInstanceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2139,13 +2097,15 @@ impl<'a, C> ProjectLocationInstanceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2434,25 +2394,15 @@ impl<'a, C> ProjectLocationInstancePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2460,13 +2410,15 @@ impl<'a, C> ProjectLocationInstancePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2738,25 +2690,15 @@ impl<'a, C> ProjectLocationInstanceUpdateParameterCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2764,13 +2706,15 @@ impl<'a, C> ProjectLocationInstanceUpdateParameterCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3035,25 +2979,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3061,13 +2995,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3311,25 +3247,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3337,13 +3263,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3578,25 +3506,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3604,13 +3522,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3860,25 +3780,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3886,13 +3796,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4148,25 +4060,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4174,13 +4076,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4430,25 +4334,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4456,13 +4350,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/memcache1/src/client.rs b/gen/memcache1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/memcache1/src/client.rs +++ b/gen/memcache1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/memcache1_beta2-cli/src/main.rs b/gen/memcache1_beta2-cli/src/main.rs index 4eb14a5f9f..9cb72594a1 100644 --- a/gen/memcache1_beta2-cli/src/main.rs +++ b/gen/memcache1_beta2-cli/src/main.rs @@ -506,7 +506,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "order-by", "filter"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -760,7 +760,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1010,7 +1010,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/memcache1_beta2/src/api.rs b/gen/memcache1_beta2/src/api.rs index df06b9b7eb..fef216948a 100644 --- a/gen/memcache1_beta2/src/api.rs +++ b/gen/memcache1_beta2/src/api.rs @@ -1022,25 +1022,15 @@ impl<'a, C> ProjectLocationInstanceApplyParameterCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1048,13 +1038,15 @@ impl<'a, C> ProjectLocationInstanceApplyParameterCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1319,25 +1311,15 @@ impl<'a, C> ProjectLocationInstanceApplySoftwareUpdateCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1345,13 +1327,15 @@ impl<'a, C> ProjectLocationInstanceApplySoftwareUpdateCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1621,25 +1605,15 @@ impl<'a, C> ProjectLocationInstanceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1647,13 +1621,15 @@ impl<'a, C> ProjectLocationInstanceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1904,25 +1880,15 @@ impl<'a, C> ProjectLocationInstanceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1930,13 +1896,15 @@ impl<'a, C> ProjectLocationInstanceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2171,25 +2139,15 @@ impl<'a, C> ProjectLocationInstanceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2197,13 +2155,15 @@ impl<'a, C> ProjectLocationInstanceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2458,25 +2418,15 @@ impl<'a, C> ProjectLocationInstanceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2484,13 +2434,15 @@ impl<'a, C> ProjectLocationInstanceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2779,25 +2731,15 @@ impl<'a, C> ProjectLocationInstancePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2805,13 +2747,15 @@ impl<'a, C> ProjectLocationInstancePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3083,25 +3027,15 @@ impl<'a, C> ProjectLocationInstanceUpdateParameterCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3109,13 +3043,15 @@ impl<'a, C> ProjectLocationInstanceUpdateParameterCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3380,25 +3316,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3406,13 +3332,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3656,25 +3584,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3682,13 +3600,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3923,25 +3843,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3949,13 +3859,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4205,25 +4117,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4231,13 +4133,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4493,25 +4397,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4519,13 +4413,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4775,25 +4671,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4801,13 +4687,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/memcache1_beta2/src/client.rs b/gen/memcache1_beta2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/memcache1_beta2/src/client.rs +++ b/gen/memcache1_beta2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/metastore1_beta-cli/src/main.rs b/gen/metastore1_beta-cli/src/main.rs index eda6254078..613b0c2e75 100644 --- a/gen/metastore1_beta-cli/src/main.rs +++ b/gen/metastore1_beta-cli/src/main.rs @@ -122,7 +122,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -288,7 +288,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -578,7 +578,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["order-by", "page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -690,7 +690,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["service-id", "request-id"].iter().map(|v|*v)); + v.extend(["request-id", "service-id"].iter().map(|v|*v)); v } )); } } @@ -1006,7 +1006,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["order-by", "page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1223,7 +1223,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["order-by", "page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/metastore1_beta/src/api.rs b/gen/metastore1_beta/src/api.rs index e1ff53f95b..fb58b4fe28 100644 --- a/gen/metastore1_beta/src/api.rs +++ b/gen/metastore1_beta/src/api.rs @@ -1526,25 +1526,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1552,13 +1542,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1793,25 +1785,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1819,13 +1801,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2075,25 +2059,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2101,13 +2075,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2394,25 +2370,15 @@ impl<'a, C> ProjectLocationServiceBackupCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2420,13 +2386,15 @@ impl<'a, C> ProjectLocationServiceBackupCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2689,25 +2657,15 @@ impl<'a, C> ProjectLocationServiceBackupDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2715,13 +2673,15 @@ impl<'a, C> ProjectLocationServiceBackupDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2963,25 +2923,15 @@ impl<'a, C> ProjectLocationServiceBackupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2989,13 +2939,15 @@ impl<'a, C> ProjectLocationServiceBackupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3250,25 +3202,15 @@ impl<'a, C> ProjectLocationServiceBackupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3276,13 +3218,15 @@ impl<'a, C> ProjectLocationServiceBackupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3576,25 +3520,15 @@ impl<'a, C> ProjectLocationServiceMetadataImportCreateCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3602,13 +3536,15 @@ impl<'a, C> ProjectLocationServiceMetadataImportCreateCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3866,25 +3802,15 @@ impl<'a, C> ProjectLocationServiceMetadataImportGetCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3892,13 +3818,15 @@ impl<'a, C> ProjectLocationServiceMetadataImportGetCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4153,25 +4081,15 @@ impl<'a, C> ProjectLocationServiceMetadataImportListCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4179,13 +4097,15 @@ impl<'a, C> ProjectLocationServiceMetadataImportListCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4479,25 +4399,15 @@ impl<'a, C> ProjectLocationServiceMetadataImportPatchCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4505,13 +4415,15 @@ impl<'a, C> ProjectLocationServiceMetadataImportPatchCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4800,25 +4712,15 @@ impl<'a, C> ProjectLocationServiceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4826,13 +4728,15 @@ impl<'a, C> ProjectLocationServiceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5095,25 +4999,15 @@ impl<'a, C> ProjectLocationServiceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5121,13 +5015,15 @@ impl<'a, C> ProjectLocationServiceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5390,25 +5286,15 @@ impl<'a, C> ProjectLocationServiceExportMetadataCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5416,13 +5302,15 @@ impl<'a, C> ProjectLocationServiceExportMetadataCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5666,25 +5554,15 @@ impl<'a, C> ProjectLocationServiceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5692,13 +5570,15 @@ impl<'a, C> ProjectLocationServiceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5938,25 +5818,15 @@ impl<'a, C> ProjectLocationServiceGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5964,13 +5834,15 @@ impl<'a, C> ProjectLocationServiceGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6232,25 +6104,15 @@ impl<'a, C> ProjectLocationServiceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6258,13 +6120,15 @@ impl<'a, C> ProjectLocationServiceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6558,25 +6422,15 @@ impl<'a, C> ProjectLocationServicePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6584,13 +6438,15 @@ impl<'a, C> ProjectLocationServicePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6869,25 +6725,15 @@ impl<'a, C> ProjectLocationServiceRestoreCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6895,13 +6741,15 @@ impl<'a, C> ProjectLocationServiceRestoreCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7166,25 +7014,15 @@ impl<'a, C> ProjectLocationServiceSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7192,13 +7030,15 @@ impl<'a, C> ProjectLocationServiceSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7463,25 +7303,15 @@ impl<'a, C> ProjectLocationServiceTestIamPermissionCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7489,13 +7319,15 @@ impl<'a, C> ProjectLocationServiceTestIamPermissionCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7739,25 +7571,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7765,13 +7587,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8021,25 +7845,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8047,13 +7861,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/metastore1_beta/src/client.rs b/gen/metastore1_beta/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/metastore1_beta/src/client.rs +++ b/gen/metastore1_beta/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/mirror1-cli/src/main.rs b/gen/mirror1-cli/src/main.rs index 700eb64dbd..0b6e2d599b 100644 --- a/gen/mirror1-cli/src/main.rs +++ b/gen/mirror1-cli/src/main.rs @@ -1481,7 +1481,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["include-deleted", "pinned-only", "page-token", "max-results", "order-by", "source-item-id", "bundle-id"].iter().map(|v|*v)); + v.extend(["bundle-id", "include-deleted", "max-results", "order-by", "page-token", "pinned-only", "source-item-id"].iter().map(|v|*v)); v } )); } } diff --git a/gen/mirror1/src/api.rs b/gen/mirror1/src/api.rs index 7704a68e2c..015c67465e 100644 --- a/gen/mirror1/src/api.rs +++ b/gen/mirror1/src/api.rs @@ -1649,25 +1649,15 @@ impl<'a, C> AccountInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1675,13 +1665,15 @@ impl<'a, C> AccountInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1913,25 +1905,15 @@ impl<'a, C> ContactDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1939,11 +1921,11 @@ impl<'a, C> ContactDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -2164,25 +2146,15 @@ impl<'a, C> ContactGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2190,13 +2162,15 @@ impl<'a, C> ContactGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2421,25 +2395,15 @@ impl<'a, C> ContactInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2447,13 +2411,15 @@ impl<'a, C> ContactInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2656,25 +2622,15 @@ impl<'a, C> ContactListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2682,13 +2638,15 @@ impl<'a, C> ContactListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2926,25 +2884,15 @@ impl<'a, C> ContactPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2952,13 +2900,15 @@ impl<'a, C> ContactPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3215,25 +3165,15 @@ impl<'a, C> ContactUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3241,13 +3181,15 @@ impl<'a, C> ContactUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3483,25 +3425,15 @@ impl<'a, C> LocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3509,13 +3441,15 @@ impl<'a, C> LocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3719,25 +3653,15 @@ impl<'a, C> LocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3745,13 +3669,15 @@ impl<'a, C> LocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3968,25 +3894,15 @@ impl<'a, C> SettingGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3994,13 +3910,15 @@ impl<'a, C> SettingGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4228,25 +4146,15 @@ impl<'a, C> SubscriptionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4254,11 +4162,11 @@ impl<'a, C> SubscriptionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -4477,25 +4385,15 @@ impl<'a, C> SubscriptionInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4503,13 +4401,15 @@ impl<'a, C> SubscriptionInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4712,25 +4612,15 @@ impl<'a, C> SubscriptionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4738,13 +4628,15 @@ impl<'a, C> SubscriptionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4982,25 +4874,15 @@ impl<'a, C> SubscriptionUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5008,13 +4890,15 @@ impl<'a, C> SubscriptionUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5251,25 +5135,15 @@ impl<'a, C> TimelineAttachmentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5277,11 +5151,11 @@ impl<'a, C> TimelineAttachmentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -5535,25 +5409,15 @@ impl<'a, C> TimelineAttachmentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5561,19 +5425,21 @@ impl<'a, C> TimelineAttachmentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = if enable_resource_parsing { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); } } - } else { (reconstructed_result, Default::default()) }; + } else { (res, Default::default()) }; dlg.finished(true); return Ok(result_value) @@ -5844,25 +5710,15 @@ impl<'a, C> TimelineAttachmentInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5870,7 +5726,7 @@ impl<'a, C> TimelineAttachmentInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -5882,7 +5738,7 @@ impl<'a, C> TimelineAttachmentInsertCall<'a, C> where C: BorrowMut TimelineAttachmentInsertCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6174,25 +6032,15 @@ impl<'a, C> TimelineAttachmentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6200,13 +6048,15 @@ impl<'a, C> TimelineAttachmentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6432,25 +6282,15 @@ impl<'a, C> TimelineDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6458,11 +6298,11 @@ impl<'a, C> TimelineDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -6683,25 +6523,15 @@ impl<'a, C> TimelineGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6709,13 +6539,15 @@ impl<'a, C> TimelineGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6985,25 +6817,15 @@ impl<'a, C> TimelineInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7011,7 +6833,7 @@ impl<'a, C> TimelineInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -7023,7 +6845,7 @@ impl<'a, C> TimelineInsertCall<'a, C> where C: BorrowMut TimelineInsertCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7326,25 +7150,15 @@ impl<'a, C> TimelineListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7352,13 +7166,15 @@ impl<'a, C> TimelineListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7645,25 +7461,15 @@ impl<'a, C> TimelinePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7671,13 +7477,15 @@ impl<'a, C> TimelinePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7979,25 +7787,15 @@ impl<'a, C> TimelineUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8005,7 +7803,7 @@ impl<'a, C> TimelineUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -8017,7 +7815,7 @@ impl<'a, C> TimelineUpdateCall<'a, C> where C: BorrowMut TimelineUpdateCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/mirror1/src/client.rs b/gen/mirror1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/mirror1/src/client.rs +++ b/gen/mirror1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/ml1-cli/src/main.rs b/gen/ml1-cli/src/main.rs index 230671a065..901a75a9b8 100644 --- a/gen/ml1-cli/src/main.rs +++ b/gen/ml1-cli/src/main.rs @@ -578,7 +578,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1043,7 +1043,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2506,7 +2506,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3091,7 +3091,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3463,7 +3463,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/ml1/src/api.rs b/gen/ml1/src/api.rs index 6e1147d51d..00bf4179d0 100644 --- a/gen/ml1/src/api.rs +++ b/gen/ml1/src/api.rs @@ -3038,25 +3038,15 @@ impl<'a, C> ProjectJobCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3064,13 +3054,15 @@ impl<'a, C> ProjectJobCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3335,25 +3327,15 @@ impl<'a, C> ProjectJobCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3361,13 +3343,15 @@ impl<'a, C> ProjectJobCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3611,25 +3595,15 @@ impl<'a, C> ProjectJobGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3637,13 +3611,15 @@ impl<'a, C> ProjectJobGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3883,25 +3859,15 @@ impl<'a, C> ProjectJobGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3909,13 +3875,15 @@ impl<'a, C> ProjectJobGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4172,25 +4140,15 @@ impl<'a, C> ProjectJobListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4198,13 +4156,15 @@ impl<'a, C> ProjectJobListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4486,25 +4446,15 @@ impl<'a, C> ProjectJobPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4512,13 +4462,15 @@ impl<'a, C> ProjectJobPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4790,25 +4742,15 @@ impl<'a, C> ProjectJobSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4816,13 +4758,15 @@ impl<'a, C> ProjectJobSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5087,25 +5031,15 @@ impl<'a, C> ProjectJobTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5113,13 +5047,15 @@ impl<'a, C> ProjectJobTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5363,25 +5299,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5389,13 +5315,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5630,25 +5558,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5656,13 +5574,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5918,25 +5838,15 @@ impl<'a, C> ProjectLocationStudyTrialAddMeasurementCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5944,13 +5854,15 @@ impl<'a, C> ProjectLocationStudyTrialAddMeasurementCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6215,25 +6127,15 @@ impl<'a, C> ProjectLocationStudyTrialCheckEarlyStoppingStateCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6241,13 +6143,15 @@ impl<'a, C> ProjectLocationStudyTrialCheckEarlyStoppingStateCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6512,25 +6416,15 @@ impl<'a, C> ProjectLocationStudyTrialCompleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6538,13 +6432,15 @@ impl<'a, C> ProjectLocationStudyTrialCompleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6809,25 +6705,15 @@ impl<'a, C> ProjectLocationStudyTrialCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6835,13 +6721,15 @@ impl<'a, C> ProjectLocationStudyTrialCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7085,25 +6973,15 @@ impl<'a, C> ProjectLocationStudyTrialDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7111,13 +6989,15 @@ impl<'a, C> ProjectLocationStudyTrialDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7352,25 +7232,15 @@ impl<'a, C> ProjectLocationStudyTrialGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7378,13 +7248,15 @@ impl<'a, C> ProjectLocationStudyTrialGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7619,25 +7491,15 @@ impl<'a, C> ProjectLocationStudyTrialListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7645,13 +7507,15 @@ impl<'a, C> ProjectLocationStudyTrialListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7907,25 +7771,15 @@ impl<'a, C> ProjectLocationStudyTrialListOptimalTrialCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7933,13 +7787,15 @@ impl<'a, C> ProjectLocationStudyTrialListOptimalTrialCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8204,25 +8060,15 @@ impl<'a, C> ProjectLocationStudyTrialStopCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8230,13 +8076,15 @@ impl<'a, C> ProjectLocationStudyTrialStopCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8501,25 +8349,15 @@ impl<'a, C> ProjectLocationStudyTrialSuggestCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8527,13 +8365,15 @@ impl<'a, C> ProjectLocationStudyTrialSuggestCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8803,25 +8643,15 @@ impl<'a, C> ProjectLocationStudyCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8829,13 +8659,15 @@ impl<'a, C> ProjectLocationStudyCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9086,25 +8918,15 @@ impl<'a, C> ProjectLocationStudyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9112,13 +8934,15 @@ impl<'a, C> ProjectLocationStudyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9353,25 +9177,15 @@ impl<'a, C> ProjectLocationStudyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9379,13 +9193,15 @@ impl<'a, C> ProjectLocationStudyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9620,25 +9436,15 @@ impl<'a, C> ProjectLocationStudyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9646,13 +9452,15 @@ impl<'a, C> ProjectLocationStudyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9887,25 +9695,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9913,13 +9711,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10164,25 +9964,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10190,13 +9980,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10466,25 +10258,15 @@ impl<'a, C> ProjectModelVersionCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10492,13 +10274,15 @@ impl<'a, C> ProjectModelVersionCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10742,25 +10526,15 @@ impl<'a, C> ProjectModelVersionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10768,13 +10542,15 @@ impl<'a, C> ProjectModelVersionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11009,25 +10785,15 @@ impl<'a, C> ProjectModelVersionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11035,13 +10801,15 @@ impl<'a, C> ProjectModelVersionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11291,25 +11059,15 @@ impl<'a, C> ProjectModelVersionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11317,13 +11075,15 @@ impl<'a, C> ProjectModelVersionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11605,25 +11365,15 @@ impl<'a, C> ProjectModelVersionPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11631,13 +11381,15 @@ impl<'a, C> ProjectModelVersionPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11909,25 +11661,15 @@ impl<'a, C> ProjectModelVersionSetDefaultCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11935,13 +11677,15 @@ impl<'a, C> ProjectModelVersionSetDefaultCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12206,25 +11950,15 @@ impl<'a, C> ProjectModelCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12232,13 +11966,15 @@ impl<'a, C> ProjectModelCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12482,25 +12218,15 @@ impl<'a, C> ProjectModelDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12508,13 +12234,15 @@ impl<'a, C> ProjectModelDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12749,25 +12477,15 @@ impl<'a, C> ProjectModelGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12775,13 +12493,15 @@ impl<'a, C> ProjectModelGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13021,25 +12741,15 @@ impl<'a, C> ProjectModelGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13047,13 +12757,15 @@ impl<'a, C> ProjectModelGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13310,25 +13022,15 @@ impl<'a, C> ProjectModelListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13336,13 +13038,15 @@ impl<'a, C> ProjectModelListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13624,25 +13328,15 @@ impl<'a, C> ProjectModelPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13650,13 +13344,15 @@ impl<'a, C> ProjectModelPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13928,25 +13624,15 @@ impl<'a, C> ProjectModelSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13954,13 +13640,15 @@ impl<'a, C> ProjectModelSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14225,25 +13913,15 @@ impl<'a, C> ProjectModelTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14251,13 +13929,15 @@ impl<'a, C> ProjectModelTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14501,25 +14181,15 @@ impl<'a, C> ProjectOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14527,13 +14197,15 @@ impl<'a, C> ProjectOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14768,25 +14440,15 @@ impl<'a, C> ProjectOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14794,13 +14456,15 @@ impl<'a, C> ProjectOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15050,25 +14714,15 @@ impl<'a, C> ProjectOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15076,13 +14730,15 @@ impl<'a, C> ProjectOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15359,25 +15015,15 @@ impl<'a, C> ProjectExplainCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15385,13 +15031,15 @@ impl<'a, C> ProjectExplainCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15635,25 +15283,15 @@ impl<'a, C> ProjectGetConfigCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15661,13 +15299,15 @@ impl<'a, C> ProjectGetConfigCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15923,25 +15563,15 @@ impl<'a, C> ProjectPredictCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15949,13 +15579,15 @@ impl<'a, C> ProjectPredictCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/ml1/src/client.rs b/gen/ml1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/ml1/src/client.rs +++ b/gen/ml1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/monitoring3-cli/src/main.rs b/gen/monitoring3-cli/src/main.rs index dd714391d5..ad46335803 100644 --- a/gen/monitoring3-cli/src/main.rs +++ b/gen/monitoring3-cli/src/main.rs @@ -106,7 +106,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["secondary-aggregation-cross-series-reducer", "view", "aggregation-cross-series-reducer", "secondary-aggregation-per-series-aligner", "interval-start-time", "filter", "interval-end-time", "aggregation-per-series-aligner", "secondary-aggregation-alignment-period", "page-token", "page-size", "order-by", "aggregation-group-by-fields", "secondary-aggregation-group-by-fields", "aggregation-alignment-period"].iter().map(|v|*v)); + v.extend(["aggregation-alignment-period", "aggregation-cross-series-reducer", "aggregation-group-by-fields", "aggregation-per-series-aligner", "filter", "interval-end-time", "interval-start-time", "order-by", "page-size", "page-token", "secondary-aggregation-alignment-period", "secondary-aggregation-cross-series-reducer", "secondary-aggregation-group-by-fields", "secondary-aggregation-per-series-aligner", "view"].iter().map(|v|*v)); v } )); } } @@ -204,7 +204,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["secondary-aggregation-cross-series-reducer", "view", "aggregation-cross-series-reducer", "secondary-aggregation-per-series-aligner", "interval-start-time", "filter", "interval-end-time", "aggregation-per-series-aligner", "secondary-aggregation-alignment-period", "page-token", "page-size", "order-by", "aggregation-group-by-fields", "secondary-aggregation-group-by-fields", "aggregation-alignment-period"].iter().map(|v|*v)); + v.extend(["aggregation-alignment-period", "aggregation-cross-series-reducer", "aggregation-group-by-fields", "aggregation-per-series-aligner", "filter", "interval-end-time", "interval-start-time", "order-by", "page-size", "page-token", "secondary-aggregation-alignment-period", "secondary-aggregation-cross-series-reducer", "secondary-aggregation-group-by-fields", "secondary-aggregation-per-series-aligner", "view"].iter().map(|v|*v)); v } )); } } @@ -471,7 +471,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "order-by", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -929,7 +929,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["ancestors-of-group", "children-of-group", "page-size", "descendants-of-group", "page-token"].iter().map(|v|*v)); + v.extend(["ancestors-of-group", "children-of-group", "descendants-of-group", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -997,7 +997,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["interval-start-time", "filter", "interval-end-time", "page-size", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "interval-end-time", "interval-start-time", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1352,7 +1352,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1466,7 +1466,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1929,7 +1929,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "order-by", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2378,7 +2378,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["secondary-aggregation-cross-series-reducer", "view", "aggregation-cross-series-reducer", "secondary-aggregation-per-series-aligner", "interval-start-time", "filter", "interval-end-time", "aggregation-per-series-aligner", "secondary-aggregation-alignment-period", "page-token", "page-size", "order-by", "aggregation-group-by-fields", "secondary-aggregation-group-by-fields", "aggregation-alignment-period"].iter().map(|v|*v)); + v.extend(["aggregation-alignment-period", "aggregation-cross-series-reducer", "aggregation-group-by-fields", "aggregation-per-series-aligner", "filter", "interval-end-time", "interval-start-time", "order-by", "page-size", "page-token", "secondary-aggregation-alignment-period", "secondary-aggregation-cross-series-reducer", "secondary-aggregation-group-by-fields", "secondary-aggregation-per-series-aligner", "view"].iter().map(|v|*v)); v } )); } } @@ -3113,7 +3113,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3511,7 +3511,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "view", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token", "view"].iter().map(|v|*v)); v } )); } } diff --git a/gen/monitoring3/src/api.rs b/gen/monitoring3/src/api.rs index 2424db5941..9acf1458ab 100644 --- a/gen/monitoring3/src/api.rs +++ b/gen/monitoring3/src/api.rs @@ -3598,25 +3598,15 @@ impl<'a, C> FolderTimeSeryListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3624,13 +3614,15 @@ impl<'a, C> FolderTimeSeryListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4051,25 +4043,15 @@ impl<'a, C> OrganizationTimeSeryListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4077,13 +4059,15 @@ impl<'a, C> OrganizationTimeSeryListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4446,25 +4430,15 @@ impl<'a, C> ProjectAlertPolicyCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4472,13 +4446,15 @@ impl<'a, C> ProjectAlertPolicyCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4722,25 +4698,15 @@ impl<'a, C> ProjectAlertPolicyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4748,13 +4714,15 @@ impl<'a, C> ProjectAlertPolicyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4989,25 +4957,15 @@ impl<'a, C> ProjectAlertPolicyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5015,13 +4973,15 @@ impl<'a, C> ProjectAlertPolicyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5276,25 +5236,15 @@ impl<'a, C> ProjectAlertPolicyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5302,13 +5252,15 @@ impl<'a, C> ProjectAlertPolicyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5597,25 +5549,15 @@ impl<'a, C> ProjectAlertPolicyPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5623,13 +5565,15 @@ impl<'a, C> ProjectAlertPolicyPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5901,25 +5845,15 @@ impl<'a, C> ProjectCollectdTimeSeryCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5927,13 +5861,15 @@ impl<'a, C> ProjectCollectdTimeSeryCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6202,25 +6138,15 @@ impl<'a, C> ProjectGroupMemberListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6228,13 +6154,15 @@ impl<'a, C> ProjectGroupMemberListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6530,25 +6458,15 @@ impl<'a, C> ProjectGroupCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6556,13 +6474,15 @@ impl<'a, C> ProjectGroupCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6818,25 +6738,15 @@ impl<'a, C> ProjectGroupDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6844,13 +6754,15 @@ impl<'a, C> ProjectGroupDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7092,25 +7004,15 @@ impl<'a, C> ProjectGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7118,13 +7020,15 @@ impl<'a, C> ProjectGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7384,25 +7288,15 @@ impl<'a, C> ProjectGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7410,13 +7304,15 @@ impl<'a, C> ProjectGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7712,25 +7608,15 @@ impl<'a, C> ProjectGroupUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7738,13 +7624,15 @@ impl<'a, C> ProjectGroupUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8016,25 +7904,15 @@ impl<'a, C> ProjectMetricDescriptorCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8042,13 +7920,15 @@ impl<'a, C> ProjectMetricDescriptorCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8292,25 +8172,15 @@ impl<'a, C> ProjectMetricDescriptorDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8318,13 +8188,15 @@ impl<'a, C> ProjectMetricDescriptorDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8559,25 +8431,15 @@ impl<'a, C> ProjectMetricDescriptorGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8585,13 +8447,15 @@ impl<'a, C> ProjectMetricDescriptorGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8841,25 +8705,15 @@ impl<'a, C> ProjectMetricDescriptorListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8867,13 +8721,15 @@ impl<'a, C> ProjectMetricDescriptorListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9129,25 +8985,15 @@ impl<'a, C> ProjectMonitoredResourceDescriptorGetCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9155,13 +9001,15 @@ impl<'a, C> ProjectMonitoredResourceDescriptorGetCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9411,25 +9259,15 @@ impl<'a, C> ProjectMonitoredResourceDescriptorListCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9437,13 +9275,15 @@ impl<'a, C> ProjectMonitoredResourceDescriptorListCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9699,25 +9539,15 @@ impl<'a, C> ProjectNotificationChannelDescriptorGetCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9725,13 +9555,15 @@ impl<'a, C> ProjectNotificationChannelDescriptorGetCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9976,25 +9808,15 @@ impl<'a, C> ProjectNotificationChannelDescriptorListCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10002,13 +9824,15 @@ impl<'a, C> ProjectNotificationChannelDescriptorListCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10278,25 +10102,15 @@ impl<'a, C> ProjectNotificationChannelCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10304,13 +10118,15 @@ impl<'a, C> ProjectNotificationChannelCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10559,25 +10375,15 @@ impl<'a, C> ProjectNotificationChannelDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10585,13 +10391,15 @@ impl<'a, C> ProjectNotificationChannelDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10833,25 +10641,15 @@ impl<'a, C> ProjectNotificationChannelGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10859,13 +10657,15 @@ impl<'a, C> ProjectNotificationChannelGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11121,25 +10921,15 @@ impl<'a, C> ProjectNotificationChannelGetVerificationCodeCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11147,13 +10937,15 @@ impl<'a, C> ProjectNotificationChannelGetVerificationCodeCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11417,25 +11209,15 @@ impl<'a, C> ProjectNotificationChannelListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11443,13 +11225,15 @@ impl<'a, C> ProjectNotificationChannelListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11738,25 +11522,15 @@ impl<'a, C> ProjectNotificationChannelPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11764,13 +11538,15 @@ impl<'a, C> ProjectNotificationChannelPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12042,25 +11818,15 @@ impl<'a, C> ProjectNotificationChannelSendVerificationCodeCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12068,13 +11834,15 @@ impl<'a, C> ProjectNotificationChannelSendVerificationCodeCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12339,25 +12107,15 @@ impl<'a, C> ProjectNotificationChannelVerifyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12365,13 +12123,15 @@ impl<'a, C> ProjectNotificationChannelVerifyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12636,25 +12396,15 @@ impl<'a, C> ProjectTimeSeryCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12662,13 +12412,15 @@ impl<'a, C> ProjectTimeSeryCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12991,25 +12743,15 @@ impl<'a, C> ProjectTimeSeryListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13017,13 +12759,15 @@ impl<'a, C> ProjectTimeSeryListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13386,25 +13130,15 @@ impl<'a, C> ProjectTimeSeryQueryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13412,13 +13146,15 @@ impl<'a, C> ProjectTimeSeryQueryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13683,25 +13419,15 @@ impl<'a, C> ProjectUptimeCheckConfigCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13709,13 +13435,15 @@ impl<'a, C> ProjectUptimeCheckConfigCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13959,25 +13687,15 @@ impl<'a, C> ProjectUptimeCheckConfigDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13985,13 +13703,15 @@ impl<'a, C> ProjectUptimeCheckConfigDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14226,25 +13946,15 @@ impl<'a, C> ProjectUptimeCheckConfigGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14252,13 +13962,15 @@ impl<'a, C> ProjectUptimeCheckConfigGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14503,25 +14215,15 @@ impl<'a, C> ProjectUptimeCheckConfigListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14529,13 +14231,15 @@ impl<'a, C> ProjectUptimeCheckConfigListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14810,25 +14514,15 @@ impl<'a, C> ProjectUptimeCheckConfigPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14836,13 +14530,15 @@ impl<'a, C> ProjectUptimeCheckConfigPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15119,25 +14815,15 @@ impl<'a, C> ServiceServiceLevelObjectiveCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15145,13 +14831,15 @@ impl<'a, C> ServiceServiceLevelObjectiveCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15402,25 +15090,15 @@ impl<'a, C> ServiceServiceLevelObjectiveDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15428,13 +15106,15 @@ impl<'a, C> ServiceServiceLevelObjectiveDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15674,25 +15354,15 @@ impl<'a, C> ServiceServiceLevelObjectiveGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15700,13 +15370,15 @@ impl<'a, C> ServiceServiceLevelObjectiveGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15968,25 +15640,15 @@ impl<'a, C> ServiceServiceLevelObjectiveListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15994,13 +15656,15 @@ impl<'a, C> ServiceServiceLevelObjectiveListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16289,25 +15953,15 @@ impl<'a, C> ServiceServiceLevelObjectivePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16315,13 +15969,15 @@ impl<'a, C> ServiceServiceLevelObjectivePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16598,25 +16254,15 @@ impl<'a, C> ServiceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16624,13 +16270,15 @@ impl<'a, C> ServiceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16881,25 +16529,15 @@ impl<'a, C> ServiceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16907,13 +16545,15 @@ impl<'a, C> ServiceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17148,25 +16788,15 @@ impl<'a, C> ServiceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17174,13 +16804,15 @@ impl<'a, C> ServiceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17430,25 +17062,15 @@ impl<'a, C> ServiceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17456,13 +17078,15 @@ impl<'a, C> ServiceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17744,25 +17368,15 @@ impl<'a, C> ServicePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17770,13 +17384,15 @@ impl<'a, C> ServicePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18010,25 +17626,15 @@ impl<'a, C> UptimeCheckIpListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18036,13 +17642,15 @@ impl<'a, C> UptimeCheckIpListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/monitoring3/src/client.rs b/gen/monitoring3/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/monitoring3/src/client.rs +++ b/gen/monitoring3/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/mybusiness4-cli/src/main.rs b/gen/mybusiness4-cli/src/main.rs index 8110bd73f5..58f2d0bc55 100644 --- a/gen/mybusiness4-cli/src/main.rs +++ b/gen/mybusiness4-cli/src/main.rs @@ -890,7 +890,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "name", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "name", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1691,7 +1691,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["validate-only", "request-id"].iter().map(|v|*v)); + v.extend(["request-id", "validate-only"].iter().map(|v|*v)); v } )); } } @@ -2129,7 +2129,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "language-code", "filter", "order-by", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "language-code", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3280,7 +3280,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["validate-only", "update-mask", "attribute-mask"].iter().map(|v|*v)); + v.extend(["attribute-mask", "update-mask", "validate-only"].iter().map(|v|*v)); v } )); } } @@ -3681,7 +3681,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "answers-per-question", "filter", "order-by", "page-size"].iter().map(|v|*v)); + v.extend(["answers-per-question", "filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -4673,7 +4673,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "country", "language-code", "name", "page-size", "category-id"].iter().map(|v|*v)); + v.extend(["category-id", "country", "language-code", "name", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -4738,7 +4738,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["region-code", "page-token", "language-code", "page-size", "search-term"].iter().map(|v|*v)); + v.extend(["language-code", "page-size", "page-token", "region-code", "search-term"].iter().map(|v|*v)); v } )); } } @@ -4843,7 +4843,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["result-count", "chain-display-name"].iter().map(|v|*v)); + v.extend(["chain-display-name", "result-count"].iter().map(|v|*v)); v } )); } } diff --git a/gen/mybusiness4/src/api.rs b/gen/mybusiness4/src/api.rs index f0da12e0f2..95c1630586 100644 --- a/gen/mybusiness4/src/api.rs +++ b/gen/mybusiness4/src/api.rs @@ -5350,25 +5350,15 @@ impl<'a, C> AccountAdminCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5376,13 +5366,15 @@ impl<'a, C> AccountAdminCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5595,25 +5587,15 @@ impl<'a, C> AccountAdminDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5621,13 +5603,15 @@ impl<'a, C> AccountAdminDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5831,25 +5815,15 @@ impl<'a, C> AccountAdminListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5857,13 +5831,15 @@ impl<'a, C> AccountAdminListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6089,25 +6065,15 @@ impl<'a, C> AccountAdminPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6115,13 +6081,15 @@ impl<'a, C> AccountAdminPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6355,25 +6323,15 @@ impl<'a, C> AccountInvitationAcceptCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6381,13 +6339,15 @@ impl<'a, C> AccountInvitationAcceptCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6621,25 +6581,15 @@ impl<'a, C> AccountInvitationDeclineCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6647,13 +6597,15 @@ impl<'a, C> AccountInvitationDeclineCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6871,25 +6823,15 @@ impl<'a, C> AccountInvitationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6897,13 +6839,15 @@ impl<'a, C> AccountInvitationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7139,25 +7083,15 @@ impl<'a, C> AccountLocationAdminCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7165,13 +7099,15 @@ impl<'a, C> AccountLocationAdminCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7384,25 +7320,15 @@ impl<'a, C> AccountLocationAdminDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7410,13 +7336,15 @@ impl<'a, C> AccountLocationAdminDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7620,25 +7548,15 @@ impl<'a, C> AccountLocationAdminListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7646,13 +7564,15 @@ impl<'a, C> AccountLocationAdminListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7878,25 +7798,15 @@ impl<'a, C> AccountLocationAdminPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7904,13 +7814,15 @@ impl<'a, C> AccountLocationAdminPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8127,25 +8039,15 @@ impl<'a, C> AccountLocationFollowerGetMetadataCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8153,13 +8055,15 @@ impl<'a, C> AccountLocationFollowerGetMetadataCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8386,25 +8290,15 @@ impl<'a, C> AccountLocationLocalPostCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8412,13 +8306,15 @@ impl<'a, C> AccountLocationLocalPostCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8632,25 +8528,15 @@ impl<'a, C> AccountLocationLocalPostDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8658,13 +8544,15 @@ impl<'a, C> AccountLocationLocalPostDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8869,25 +8757,15 @@ impl<'a, C> AccountLocationLocalPostGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8895,13 +8773,15 @@ impl<'a, C> AccountLocationLocalPostGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9115,25 +8995,15 @@ impl<'a, C> AccountLocationLocalPostListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9141,13 +9011,15 @@ impl<'a, C> AccountLocationLocalPostListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9392,25 +9264,15 @@ impl<'a, C> AccountLocationLocalPostPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9418,13 +9280,15 @@ impl<'a, C> AccountLocationLocalPostPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9670,25 +9534,15 @@ impl<'a, C> AccountLocationLocalPostReportInsightCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9696,13 +9550,15 @@ impl<'a, C> AccountLocationLocalPostReportInsightCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9915,25 +9771,15 @@ impl<'a, C> AccountLocationMediaCustomerGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9941,13 +9787,15 @@ impl<'a, C> AccountLocationMediaCustomerGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10162,25 +10010,15 @@ impl<'a, C> AccountLocationMediaCustomerListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10188,13 +10026,15 @@ impl<'a, C> AccountLocationMediaCustomerListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10434,25 +10274,15 @@ impl<'a, C> AccountLocationMediaCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10460,13 +10290,15 @@ impl<'a, C> AccountLocationMediaCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10679,25 +10511,15 @@ impl<'a, C> AccountLocationMediaDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10705,13 +10527,15 @@ impl<'a, C> AccountLocationMediaDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10915,25 +10739,15 @@ impl<'a, C> AccountLocationMediaGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10941,13 +10755,15 @@ impl<'a, C> AccountLocationMediaGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11161,25 +10977,15 @@ impl<'a, C> AccountLocationMediaListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11187,13 +10993,15 @@ impl<'a, C> AccountLocationMediaListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11441,25 +11249,15 @@ impl<'a, C> AccountLocationMediaPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11467,13 +11265,15 @@ impl<'a, C> AccountLocationMediaPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11716,25 +11516,15 @@ impl<'a, C> AccountLocationMediaStartUploadCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11742,13 +11532,15 @@ impl<'a, C> AccountLocationMediaStartUploadCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11961,25 +11753,15 @@ impl<'a, C> AccountLocationQuestionAnswerDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11987,13 +11769,15 @@ impl<'a, C> AccountLocationQuestionAnswerDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12212,25 +11996,15 @@ impl<'a, C> AccountLocationQuestionAnswerListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12238,13 +12012,15 @@ impl<'a, C> AccountLocationQuestionAnswerListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12495,25 +12271,15 @@ impl<'a, C> AccountLocationQuestionAnswerUpsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12521,13 +12287,15 @@ impl<'a, C> AccountLocationQuestionAnswerUpsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12761,25 +12529,15 @@ impl<'a, C> AccountLocationQuestionCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12787,13 +12545,15 @@ impl<'a, C> AccountLocationQuestionCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13006,25 +12766,15 @@ impl<'a, C> AccountLocationQuestionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13032,13 +12782,15 @@ impl<'a, C> AccountLocationQuestionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13268,25 +13020,15 @@ impl<'a, C> AccountLocationQuestionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13294,13 +13036,15 @@ impl<'a, C> AccountLocationQuestionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13566,25 +13310,15 @@ impl<'a, C> AccountLocationQuestionPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13592,13 +13326,15 @@ impl<'a, C> AccountLocationQuestionPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13812,25 +13548,15 @@ impl<'a, C> AccountLocationReviewDeleteReplyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13838,13 +13564,15 @@ impl<'a, C> AccountLocationReviewDeleteReplyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14050,25 +13778,15 @@ impl<'a, C> AccountLocationReviewGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14076,13 +13794,15 @@ impl<'a, C> AccountLocationReviewGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14302,25 +14022,15 @@ impl<'a, C> AccountLocationReviewListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14328,13 +14038,15 @@ impl<'a, C> AccountLocationReviewListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14587,25 +14299,15 @@ impl<'a, C> AccountLocationReviewUpdateReplyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14613,13 +14315,15 @@ impl<'a, C> AccountLocationReviewUpdateReplyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14856,25 +14560,15 @@ impl<'a, C> AccountLocationVerificationCompleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14882,13 +14576,15 @@ impl<'a, C> AccountLocationVerificationCompleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15111,25 +14807,15 @@ impl<'a, C> AccountLocationVerificationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15137,13 +14823,15 @@ impl<'a, C> AccountLocationVerificationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15385,25 +15073,15 @@ impl<'a, C> AccountLocationAssociateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15411,13 +15089,15 @@ impl<'a, C> AccountLocationAssociateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15651,25 +15331,15 @@ impl<'a, C> AccountLocationBatchGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15677,13 +15347,15 @@ impl<'a, C> AccountLocationBatchGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15920,25 +15592,15 @@ impl<'a, C> AccountLocationBatchGetReviewCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15946,13 +15608,15 @@ impl<'a, C> AccountLocationBatchGetReviewCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16188,25 +15852,15 @@ impl<'a, C> AccountLocationClearAssociationCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16214,13 +15868,15 @@ impl<'a, C> AccountLocationClearAssociationCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16465,25 +16121,15 @@ impl<'a, C> AccountLocationCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16491,13 +16137,15 @@ impl<'a, C> AccountLocationCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16732,25 +16380,15 @@ impl<'a, C> AccountLocationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16758,13 +16396,15 @@ impl<'a, C> AccountLocationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16990,25 +16630,15 @@ impl<'a, C> AccountLocationFetchVerificationOptionCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17016,13 +16646,15 @@ impl<'a, C> AccountLocationFetchVerificationOptionCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17257,25 +16889,15 @@ impl<'a, C> AccountLocationFindMatcheCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17283,13 +16905,15 @@ impl<'a, C> AccountLocationFindMatcheCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17503,25 +17127,15 @@ impl<'a, C> AccountLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17529,13 +17143,15 @@ impl<'a, C> AccountLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17740,25 +17356,15 @@ impl<'a, C> AccountLocationGetGoogleUpdatedCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17766,13 +17372,15 @@ impl<'a, C> AccountLocationGetGoogleUpdatedCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18001,25 +17609,15 @@ impl<'a, C> AccountLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18027,13 +17625,15 @@ impl<'a, C> AccountLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18331,25 +17931,15 @@ impl<'a, C> AccountLocationPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18357,13 +17947,15 @@ impl<'a, C> AccountLocationPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18628,25 +18220,15 @@ impl<'a, C> AccountLocationReportInsightCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18654,13 +18236,15 @@ impl<'a, C> AccountLocationReportInsightCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18898,25 +18482,15 @@ impl<'a, C> AccountLocationTransferCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18924,13 +18498,15 @@ impl<'a, C> AccountLocationTransferCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19164,25 +18740,15 @@ impl<'a, C> AccountLocationVerifyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19190,13 +18756,15 @@ impl<'a, C> AccountLocationVerifyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19416,25 +18984,15 @@ impl<'a, C> AccountCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19442,13 +19000,15 @@ impl<'a, C> AccountCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19659,25 +19219,15 @@ impl<'a, C> AccountDeleteNotificationCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19685,13 +19235,15 @@ impl<'a, C> AccountDeleteNotificationCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19918,25 +19470,15 @@ impl<'a, C> AccountGenerateAccountNumberCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19944,13 +19486,15 @@ impl<'a, C> AccountGenerateAccountNumberCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20164,25 +19708,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20190,13 +19724,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20400,25 +19936,15 @@ impl<'a, C> AccountGetNotificationCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20426,13 +19952,15 @@ impl<'a, C> AccountGetNotificationCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20631,25 +20159,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20657,13 +20175,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20917,25 +20437,15 @@ impl<'a, C> AccountListRecommendGoogleLocationCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20943,13 +20453,15 @@ impl<'a, C> AccountListRecommendGoogleLocationCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21199,25 +20711,15 @@ impl<'a, C> AccountUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21225,13 +20727,15 @@ impl<'a, C> AccountUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21480,25 +20984,15 @@ impl<'a, C> AccountUpdateNotificationCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21506,13 +21000,15 @@ impl<'a, C> AccountUpdateNotificationCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21729,25 +21225,15 @@ impl<'a, C> AttributeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21755,13 +21241,15 @@ impl<'a, C> AttributeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22003,25 +21491,15 @@ impl<'a, C> CategoryListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22029,13 +21507,15 @@ impl<'a, C> CategoryListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22267,25 +21747,15 @@ impl<'a, C> ChainGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22293,13 +21763,15 @@ impl<'a, C> ChainGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22486,25 +21958,15 @@ impl<'a, C> ChainSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22512,13 +21974,15 @@ impl<'a, C> ChainSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22750,25 +22214,15 @@ impl<'a, C> GoogleLocationReportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22776,13 +22230,15 @@ impl<'a, C> GoogleLocationReportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22991,25 +22447,15 @@ impl<'a, C> GoogleLocationSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23017,13 +22463,15 @@ impl<'a, C> GoogleLocationSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23223,25 +22671,15 @@ impl<'a, C> VerificationTokenGenerateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23249,13 +22687,15 @@ impl<'a, C> VerificationTokenGenerateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/mybusiness4/src/client.rs b/gen/mybusiness4/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/mybusiness4/src/client.rs +++ b/gen/mybusiness4/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/mybusinessaccountmanagement1-cli/src/main.rs b/gen/mybusinessaccountmanagement1-cli/src/main.rs index bd1bdee2ca..5cfc0cd198 100644 --- a/gen/mybusinessaccountmanagement1-cli/src/main.rs +++ b/gen/mybusinessaccountmanagement1-cli/src/main.rs @@ -712,7 +712,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["parent-account", "page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token", "parent-account"].iter().map(|v|*v)); v } )); } } @@ -822,7 +822,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["validate-only", "update-mask"].iter().map(|v|*v)); + v.extend(["update-mask", "validate-only"].iter().map(|v|*v)); v } )); } } diff --git a/gen/mybusinessaccountmanagement1/src/api.rs b/gen/mybusinessaccountmanagement1/src/api.rs index 8cdc8d7942..5fdafa4077 100644 --- a/gen/mybusinessaccountmanagement1/src/api.rs +++ b/gen/mybusinessaccountmanagement1/src/api.rs @@ -1001,25 +1001,15 @@ impl<'a, C> AccountAdminCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1027,13 +1017,15 @@ impl<'a, C> AccountAdminCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1246,25 +1238,15 @@ impl<'a, C> AccountAdminDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1272,13 +1254,15 @@ impl<'a, C> AccountAdminDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1482,25 +1466,15 @@ impl<'a, C> AccountAdminListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1508,13 +1482,15 @@ impl<'a, C> AccountAdminListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1744,25 +1720,15 @@ impl<'a, C> AccountAdminPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1770,13 +1736,15 @@ impl<'a, C> AccountAdminPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2017,25 +1985,15 @@ impl<'a, C> AccountInvitationAcceptCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2043,13 +2001,15 @@ impl<'a, C> AccountInvitationAcceptCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2283,25 +2243,15 @@ impl<'a, C> AccountInvitationDeclineCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2309,13 +2259,15 @@ impl<'a, C> AccountInvitationDeclineCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2533,25 +2485,15 @@ impl<'a, C> AccountInvitationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2559,13 +2501,15 @@ impl<'a, C> AccountInvitationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2770,25 +2714,15 @@ impl<'a, C> AccountCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2796,13 +2730,15 @@ impl<'a, C> AccountCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3005,25 +2941,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3031,13 +2957,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3234,25 +3162,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3260,13 +3178,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3519,25 +3439,15 @@ impl<'a, C> AccountPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3545,13 +3455,15 @@ impl<'a, C> AccountPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3799,25 +3711,15 @@ impl<'a, C> LocationAdminCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3825,13 +3727,15 @@ impl<'a, C> LocationAdminCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4044,25 +3948,15 @@ impl<'a, C> LocationAdminDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4070,13 +3964,15 @@ impl<'a, C> LocationAdminDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4280,25 +4176,15 @@ impl<'a, C> LocationAdminListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4306,13 +4192,15 @@ impl<'a, C> LocationAdminListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4542,25 +4430,15 @@ impl<'a, C> LocationAdminPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4568,13 +4446,15 @@ impl<'a, C> LocationAdminPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4811,25 +4691,15 @@ impl<'a, C> LocationTransferLocationCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4837,13 +4707,15 @@ impl<'a, C> LocationTransferLocationCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/mybusinessaccountmanagement1/src/client.rs b/gen/mybusinessaccountmanagement1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/mybusinessaccountmanagement1/src/client.rs +++ b/gen/mybusinessaccountmanagement1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/networkconnectivity1_alpha1-cli/src/main.rs b/gen/networkconnectivity1_alpha1-cli/src/main.rs index 85f3a5319d..f27a06a28f 100644 --- a/gen/networkconnectivity1_alpha1-cli/src/main.rs +++ b/gen/networkconnectivity1_alpha1-cli/src/main.rs @@ -388,7 +388,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "order-by", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -487,7 +487,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["update-mask", "request-id"].iter().map(|v|*v)); + v.extend(["request-id", "update-mask"].iter().map(|v|*v)); v } )); } } @@ -949,7 +949,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1199,7 +1199,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1757,7 +1757,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "order-by", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1858,7 +1858,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["update-mask", "request-id"].iter().map(|v|*v)); + v.extend(["request-id", "update-mask"].iter().map(|v|*v)); v } )); } } diff --git a/gen/networkconnectivity1_alpha1/src/api.rs b/gen/networkconnectivity1_alpha1/src/api.rs index 05976b61fe..119865165b 100644 --- a/gen/networkconnectivity1_alpha1/src/api.rs +++ b/gen/networkconnectivity1_alpha1/src/api.rs @@ -1385,25 +1385,15 @@ impl<'a, C> ProjectLocationGlobalHubCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1411,13 +1401,15 @@ impl<'a, C> ProjectLocationGlobalHubCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1680,25 +1672,15 @@ impl<'a, C> ProjectLocationGlobalHubDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1706,13 +1688,15 @@ impl<'a, C> ProjectLocationGlobalHubDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1954,25 +1938,15 @@ impl<'a, C> ProjectLocationGlobalHubGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1980,13 +1954,15 @@ impl<'a, C> ProjectLocationGlobalHubGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2226,25 +2202,15 @@ impl<'a, C> ProjectLocationGlobalHubGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2252,13 +2218,15 @@ impl<'a, C> ProjectLocationGlobalHubGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2520,25 +2488,15 @@ impl<'a, C> ProjectLocationGlobalHubListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2546,13 +2504,15 @@ impl<'a, C> ProjectLocationGlobalHubListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2846,25 +2806,15 @@ impl<'a, C> ProjectLocationGlobalHubPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2872,13 +2822,15 @@ impl<'a, C> ProjectLocationGlobalHubPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3157,25 +3109,15 @@ impl<'a, C> ProjectLocationGlobalHubSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3183,13 +3125,15 @@ impl<'a, C> ProjectLocationGlobalHubSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3454,25 +3398,15 @@ impl<'a, C> ProjectLocationGlobalHubTestIamPermissionCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3480,13 +3414,15 @@ impl<'a, C> ProjectLocationGlobalHubTestIamPermissionCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3735,25 +3671,15 @@ impl<'a, C> ProjectLocationInternalRangeGetIamPolicyCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3761,13 +3687,15 @@ impl<'a, C> ProjectLocationInternalRangeGetIamPolicyCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4030,25 +3958,15 @@ impl<'a, C> ProjectLocationInternalRangeSetIamPolicyCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4056,13 +3974,15 @@ impl<'a, C> ProjectLocationInternalRangeSetIamPolicyCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4327,25 +4247,15 @@ impl<'a, C> ProjectLocationInternalRangeTestIamPermissionCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4353,13 +4263,15 @@ impl<'a, C> ProjectLocationInternalRangeTestIamPermissionCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4624,25 +4536,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4650,13 +4552,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4900,25 +4804,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4926,13 +4820,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5167,25 +5063,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5193,13 +5079,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5449,25 +5337,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5475,13 +5353,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5742,25 +5622,15 @@ impl<'a, C> ProjectLocationPolicyBasedRouteGetIamPolicyCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5768,13 +5638,15 @@ impl<'a, C> ProjectLocationPolicyBasedRouteGetIamPolicyCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6037,25 +5909,15 @@ impl<'a, C> ProjectLocationPolicyBasedRouteSetIamPolicyCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6063,13 +5925,15 @@ impl<'a, C> ProjectLocationPolicyBasedRouteSetIamPolicyCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6334,25 +6198,15 @@ impl<'a, C> ProjectLocationPolicyBasedRouteTestIamPermissionCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6360,13 +6214,15 @@ impl<'a, C> ProjectLocationPolicyBasedRouteTestIamPermissionCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6641,25 +6497,15 @@ impl<'a, C> ProjectLocationSpokeCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6667,13 +6513,15 @@ impl<'a, C> ProjectLocationSpokeCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6936,25 +6784,15 @@ impl<'a, C> ProjectLocationSpokeDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6962,13 +6800,15 @@ impl<'a, C> ProjectLocationSpokeDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7210,25 +7050,15 @@ impl<'a, C> ProjectLocationSpokeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7236,13 +7066,15 @@ impl<'a, C> ProjectLocationSpokeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7482,25 +7314,15 @@ impl<'a, C> ProjectLocationSpokeGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7508,13 +7330,15 @@ impl<'a, C> ProjectLocationSpokeGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7776,25 +7600,15 @@ impl<'a, C> ProjectLocationSpokeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7802,13 +7616,15 @@ impl<'a, C> ProjectLocationSpokeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8102,25 +7918,15 @@ impl<'a, C> ProjectLocationSpokePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8128,13 +7934,15 @@ impl<'a, C> ProjectLocationSpokePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8413,25 +8221,15 @@ impl<'a, C> ProjectLocationSpokeSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8439,13 +8237,15 @@ impl<'a, C> ProjectLocationSpokeSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8710,25 +8510,15 @@ impl<'a, C> ProjectLocationSpokeTestIamPermissionCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8736,13 +8526,15 @@ impl<'a, C> ProjectLocationSpokeTestIamPermissionCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8986,25 +8778,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9012,13 +8794,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9268,25 +9052,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9294,13 +9068,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/networkconnectivity1_alpha1/src/client.rs b/gen/networkconnectivity1_alpha1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/networkconnectivity1_alpha1/src/client.rs +++ b/gen/networkconnectivity1_alpha1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/networkmanagement1-cli/src/main.rs b/gen/networkmanagement1-cli/src/main.rs index a192b36173..b97a1c39f4 100644 --- a/gen/networkmanagement1-cli/src/main.rs +++ b/gen/networkmanagement1-cli/src/main.rs @@ -397,7 +397,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1015,7 +1015,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1077,7 +1077,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/networkmanagement1/src/api.rs b/gen/networkmanagement1/src/api.rs index 6899c649f6..a1621426b0 100644 --- a/gen/networkmanagement1/src/api.rs +++ b/gen/networkmanagement1/src/api.rs @@ -1526,25 +1526,15 @@ impl<'a, C> ProjectLocationGlobalConnectivityTestCreateCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1552,13 +1542,15 @@ impl<'a, C> ProjectLocationGlobalConnectivityTestCreateCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1809,25 +1801,15 @@ impl<'a, C> ProjectLocationGlobalConnectivityTestDeleteCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1835,13 +1817,15 @@ impl<'a, C> ProjectLocationGlobalConnectivityTestDeleteCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2076,25 +2060,15 @@ impl<'a, C> ProjectLocationGlobalConnectivityTestGetCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2102,13 +2076,15 @@ impl<'a, C> ProjectLocationGlobalConnectivityTestGetCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2348,25 +2324,15 @@ impl<'a, C> ProjectLocationGlobalConnectivityTestGetIamPolicyCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2374,13 +2340,15 @@ impl<'a, C> ProjectLocationGlobalConnectivityTestGetIamPolicyCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2642,25 +2610,15 @@ impl<'a, C> ProjectLocationGlobalConnectivityTestListCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2668,13 +2626,15 @@ impl<'a, C> ProjectLocationGlobalConnectivityTestListCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2963,25 +2923,15 @@ impl<'a, C> ProjectLocationGlobalConnectivityTestPatchCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2989,13 +2939,15 @@ impl<'a, C> ProjectLocationGlobalConnectivityTestPatchCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3267,25 +3219,15 @@ impl<'a, C> ProjectLocationGlobalConnectivityTestRerunCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3293,13 +3235,15 @@ impl<'a, C> ProjectLocationGlobalConnectivityTestRerunCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3564,25 +3508,15 @@ impl<'a, C> ProjectLocationGlobalConnectivityTestSetIamPolicyCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3590,13 +3524,15 @@ impl<'a, C> ProjectLocationGlobalConnectivityTestSetIamPolicyCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3861,25 +3797,15 @@ impl<'a, C> ProjectLocationGlobalConnectivityTestTestIamPermissionCall<'a, C> wh return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3887,13 +3813,15 @@ impl<'a, C> ProjectLocationGlobalConnectivityTestTestIamPermissionCall<'a, C> wh } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4158,25 +4086,15 @@ impl<'a, C> ProjectLocationGlobalOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4184,13 +4102,15 @@ impl<'a, C> ProjectLocationGlobalOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4434,25 +4354,15 @@ impl<'a, C> ProjectLocationGlobalOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4460,13 +4370,15 @@ impl<'a, C> ProjectLocationGlobalOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4701,25 +4613,15 @@ impl<'a, C> ProjectLocationGlobalOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4727,13 +4629,15 @@ impl<'a, C> ProjectLocationGlobalOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4983,25 +4887,15 @@ impl<'a, C> ProjectLocationGlobalOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5009,13 +4903,15 @@ impl<'a, C> ProjectLocationGlobalOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5271,25 +5167,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5297,13 +5183,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5553,25 +5441,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5579,13 +5457,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/networkmanagement1/src/client.rs b/gen/networkmanagement1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/networkmanagement1/src/client.rs +++ b/gen/networkmanagement1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/notebooks1-cli/src/main.rs b/gen/notebooks1-cli/src/main.rs index 0eb3dd931e..9b565b6090 100644 --- a/gen/notebooks1-cli/src/main.rs +++ b/gen/notebooks1-cli/src/main.rs @@ -269,7 +269,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -543,7 +543,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["order-by", "page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1042,7 +1042,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2123,7 +2123,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2373,7 +2373,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2648,7 +2648,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["order-by", "page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/notebooks1/src/api.rs b/gen/notebooks1/src/api.rs index dc78076aaf..044dd439ab 100644 --- a/gen/notebooks1/src/api.rs +++ b/gen/notebooks1/src/api.rs @@ -2144,25 +2144,15 @@ impl<'a, C> ProjectLocationEnvironmentCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2170,13 +2160,15 @@ impl<'a, C> ProjectLocationEnvironmentCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2427,25 +2419,15 @@ impl<'a, C> ProjectLocationEnvironmentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2453,13 +2435,15 @@ impl<'a, C> ProjectLocationEnvironmentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2694,25 +2678,15 @@ impl<'a, C> ProjectLocationEnvironmentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2720,13 +2694,15 @@ impl<'a, C> ProjectLocationEnvironmentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2971,25 +2947,15 @@ impl<'a, C> ProjectLocationEnvironmentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2997,13 +2963,15 @@ impl<'a, C> ProjectLocationEnvironmentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3278,25 +3246,15 @@ impl<'a, C> ProjectLocationExecutionCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3304,13 +3262,15 @@ impl<'a, C> ProjectLocationExecutionCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3561,25 +3521,15 @@ impl<'a, C> ProjectLocationExecutionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3587,13 +3537,15 @@ impl<'a, C> ProjectLocationExecutionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3828,25 +3780,15 @@ impl<'a, C> ProjectLocationExecutionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3854,13 +3796,15 @@ impl<'a, C> ProjectLocationExecutionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4115,25 +4059,15 @@ impl<'a, C> ProjectLocationExecutionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4141,13 +4075,15 @@ impl<'a, C> ProjectLocationExecutionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4436,25 +4372,15 @@ impl<'a, C> ProjectLocationInstanceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4462,13 +4388,15 @@ impl<'a, C> ProjectLocationInstanceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4719,25 +4647,15 @@ impl<'a, C> ProjectLocationInstanceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4745,13 +4663,15 @@ impl<'a, C> ProjectLocationInstanceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4986,25 +4906,15 @@ impl<'a, C> ProjectLocationInstanceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5012,13 +4922,15 @@ impl<'a, C> ProjectLocationInstanceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5258,25 +5170,15 @@ impl<'a, C> ProjectLocationInstanceGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5284,13 +5186,15 @@ impl<'a, C> ProjectLocationInstanceGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5532,25 +5436,15 @@ impl<'a, C> ProjectLocationInstanceGetInstanceHealthCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5558,13 +5452,15 @@ impl<'a, C> ProjectLocationInstanceGetInstanceHealthCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5799,25 +5695,15 @@ impl<'a, C> ProjectLocationInstanceIsUpgradeableCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5825,13 +5711,15 @@ impl<'a, C> ProjectLocationInstanceIsUpgradeableCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6076,25 +5964,15 @@ impl<'a, C> ProjectLocationInstanceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6102,13 +5980,15 @@ impl<'a, C> ProjectLocationInstanceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6378,25 +6258,15 @@ impl<'a, C> ProjectLocationInstanceRegisterCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6404,13 +6274,15 @@ impl<'a, C> ProjectLocationInstanceRegisterCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6675,25 +6547,15 @@ impl<'a, C> ProjectLocationInstanceReportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6701,13 +6563,15 @@ impl<'a, C> ProjectLocationInstanceReportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6972,25 +6836,15 @@ impl<'a, C> ProjectLocationInstanceResetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6998,13 +6852,15 @@ impl<'a, C> ProjectLocationInstanceResetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7269,25 +7125,15 @@ impl<'a, C> ProjectLocationInstanceSetAcceleratorCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7295,13 +7141,15 @@ impl<'a, C> ProjectLocationInstanceSetAcceleratorCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7566,25 +7414,15 @@ impl<'a, C> ProjectLocationInstanceSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7592,13 +7430,15 @@ impl<'a, C> ProjectLocationInstanceSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7863,25 +7703,15 @@ impl<'a, C> ProjectLocationInstanceSetLabelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7889,13 +7719,15 @@ impl<'a, C> ProjectLocationInstanceSetLabelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8160,25 +7992,15 @@ impl<'a, C> ProjectLocationInstanceSetMachineTypeCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8186,13 +8008,15 @@ impl<'a, C> ProjectLocationInstanceSetMachineTypeCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8457,25 +8281,15 @@ impl<'a, C> ProjectLocationInstanceStartCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8483,13 +8297,15 @@ impl<'a, C> ProjectLocationInstanceStartCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8754,25 +8570,15 @@ impl<'a, C> ProjectLocationInstanceStopCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8780,13 +8586,15 @@ impl<'a, C> ProjectLocationInstanceStopCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9051,25 +8859,15 @@ impl<'a, C> ProjectLocationInstanceTestIamPermissionCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9077,13 +8875,15 @@ impl<'a, C> ProjectLocationInstanceTestIamPermissionCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9348,25 +9148,15 @@ impl<'a, C> ProjectLocationInstanceUpgradeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9374,13 +9164,15 @@ impl<'a, C> ProjectLocationInstanceUpgradeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9645,25 +9437,15 @@ impl<'a, C> ProjectLocationInstanceUpgradeInternalCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9671,13 +9453,15 @@ impl<'a, C> ProjectLocationInstanceUpgradeInternalCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9942,25 +9726,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9968,13 +9742,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10218,25 +9994,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10244,13 +10010,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10485,25 +10253,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10511,13 +10269,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10767,25 +10527,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10793,13 +10543,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11081,25 +10833,15 @@ impl<'a, C> ProjectLocationScheduleCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11107,13 +10849,15 @@ impl<'a, C> ProjectLocationScheduleCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11364,25 +11108,15 @@ impl<'a, C> ProjectLocationScheduleDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11390,13 +11124,15 @@ impl<'a, C> ProjectLocationScheduleDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11631,25 +11367,15 @@ impl<'a, C> ProjectLocationScheduleGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11657,13 +11383,15 @@ impl<'a, C> ProjectLocationScheduleGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11918,25 +11646,15 @@ impl<'a, C> ProjectLocationScheduleListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11944,13 +11662,15 @@ impl<'a, C> ProjectLocationScheduleListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12234,25 +11954,15 @@ impl<'a, C> ProjectLocationScheduleTriggerCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12260,13 +11970,15 @@ impl<'a, C> ProjectLocationScheduleTriggerCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12510,25 +12222,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12536,13 +12238,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12792,25 +12496,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12818,13 +12512,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/notebooks1/src/client.rs b/gen/notebooks1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/notebooks1/src/client.rs +++ b/gen/notebooks1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/ondemandscanning1-cli/src/main.rs b/gen/ondemandscanning1-cli/src/main.rs index cc87cdb1f6..98b450894a 100644 --- a/gen/ondemandscanning1-cli/src/main.rs +++ b/gen/ondemandscanning1-cli/src/main.rs @@ -226,7 +226,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -426,7 +426,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/ondemandscanning1/src/api.rs b/gen/ondemandscanning1/src/api.rs index abd49c1570..8daaba1c8b 100644 --- a/gen/ondemandscanning1/src/api.rs +++ b/gen/ondemandscanning1/src/api.rs @@ -1358,25 +1358,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1384,13 +1374,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1625,25 +1617,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1651,13 +1633,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1892,25 +1876,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1918,13 +1892,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2174,25 +2150,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2200,13 +2166,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2467,25 +2435,15 @@ impl<'a, C> ProjectLocationOperationWaitCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2493,13 +2451,15 @@ impl<'a, C> ProjectLocationOperationWaitCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2751,25 +2711,15 @@ impl<'a, C> ProjectLocationScanVulnerabilityListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2777,13 +2727,15 @@ impl<'a, C> ProjectLocationScanVulnerabilityListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3053,25 +3005,15 @@ impl<'a, C> ProjectLocationScanAnalyzePackageCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3079,13 +3021,15 @@ impl<'a, C> ProjectLocationScanAnalyzePackageCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/ondemandscanning1/src/client.rs b/gen/ondemandscanning1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/ondemandscanning1/src/client.rs +++ b/gen/ondemandscanning1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/orgpolicy2-cli/src/main.rs b/gen/orgpolicy2-cli/src/main.rs index 333b6223e3..a1aab2d96a 100644 --- a/gen/orgpolicy2-cli/src/main.rs +++ b/gen/orgpolicy2-cli/src/main.rs @@ -67,7 +67,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -371,7 +371,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -519,7 +519,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -823,7 +823,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -971,7 +971,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1275,7 +1275,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/orgpolicy2/src/api.rs b/gen/orgpolicy2/src/api.rs index cfaa0cf998..1b9c56dbc5 100644 --- a/gen/orgpolicy2/src/api.rs +++ b/gen/orgpolicy2/src/api.rs @@ -1075,25 +1075,15 @@ impl<'a, C> FolderConstraintListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1101,13 +1091,15 @@ impl<'a, C> FolderConstraintListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1377,25 +1369,15 @@ impl<'a, C> FolderPolicyCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1403,13 +1385,15 @@ impl<'a, C> FolderPolicyCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1653,25 +1637,15 @@ impl<'a, C> FolderPolicyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1679,13 +1653,15 @@ impl<'a, C> FolderPolicyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1920,25 +1896,15 @@ impl<'a, C> FolderPolicyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1946,13 +1912,15 @@ impl<'a, C> FolderPolicyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2187,25 +2155,15 @@ impl<'a, C> FolderPolicyGetEffectivePolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2213,13 +2171,15 @@ impl<'a, C> FolderPolicyGetEffectivePolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2464,25 +2424,15 @@ impl<'a, C> FolderPolicyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2490,13 +2440,15 @@ impl<'a, C> FolderPolicyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2766,25 +2718,15 @@ impl<'a, C> FolderPolicyPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2792,13 +2734,15 @@ impl<'a, C> FolderPolicyPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3052,25 +2996,15 @@ impl<'a, C> OrganizationConstraintListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3078,13 +3012,15 @@ impl<'a, C> OrganizationConstraintListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3354,25 +3290,15 @@ impl<'a, C> OrganizationPolicyCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3380,13 +3306,15 @@ impl<'a, C> OrganizationPolicyCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3630,25 +3558,15 @@ impl<'a, C> OrganizationPolicyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3656,13 +3574,15 @@ impl<'a, C> OrganizationPolicyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3897,25 +3817,15 @@ impl<'a, C> OrganizationPolicyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3923,13 +3833,15 @@ impl<'a, C> OrganizationPolicyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4164,25 +4076,15 @@ impl<'a, C> OrganizationPolicyGetEffectivePolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4190,13 +4092,15 @@ impl<'a, C> OrganizationPolicyGetEffectivePolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4441,25 +4345,15 @@ impl<'a, C> OrganizationPolicyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4467,13 +4361,15 @@ impl<'a, C> OrganizationPolicyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4743,25 +4639,15 @@ impl<'a, C> OrganizationPolicyPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4769,13 +4655,15 @@ impl<'a, C> OrganizationPolicyPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5029,25 +4917,15 @@ impl<'a, C> ProjectConstraintListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5055,13 +4933,15 @@ impl<'a, C> ProjectConstraintListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5331,25 +5211,15 @@ impl<'a, C> ProjectPolicyCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5357,13 +5227,15 @@ impl<'a, C> ProjectPolicyCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5607,25 +5479,15 @@ impl<'a, C> ProjectPolicyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5633,13 +5495,15 @@ impl<'a, C> ProjectPolicyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5874,25 +5738,15 @@ impl<'a, C> ProjectPolicyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5900,13 +5754,15 @@ impl<'a, C> ProjectPolicyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6141,25 +5997,15 @@ impl<'a, C> ProjectPolicyGetEffectivePolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6167,13 +6013,15 @@ impl<'a, C> ProjectPolicyGetEffectivePolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6418,25 +6266,15 @@ impl<'a, C> ProjectPolicyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6444,13 +6282,15 @@ impl<'a, C> ProjectPolicyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6720,25 +6560,15 @@ impl<'a, C> ProjectPolicyPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6746,13 +6576,15 @@ impl<'a, C> ProjectPolicyPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/orgpolicy2/src/client.rs b/gen/orgpolicy2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/orgpolicy2/src/client.rs +++ b/gen/orgpolicy2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/oslogin1/src/api.rs b/gen/oslogin1/src/api.rs index ebe27e1ddf..61007f0194 100644 --- a/gen/oslogin1/src/api.rs +++ b/gen/oslogin1/src/api.rs @@ -602,25 +602,15 @@ impl<'a, C> UserProjectDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -628,13 +618,15 @@ impl<'a, C> UserProjectDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -869,25 +861,15 @@ impl<'a, C> UserSshPublicKeyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -895,13 +877,15 @@ impl<'a, C> UserSshPublicKeyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1136,25 +1120,15 @@ impl<'a, C> UserSshPublicKeyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1162,13 +1136,15 @@ impl<'a, C> UserSshPublicKeyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1429,25 +1405,15 @@ impl<'a, C> UserSshPublicKeyPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1455,13 +1421,15 @@ impl<'a, C> UserSshPublicKeyPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1722,25 +1690,15 @@ impl<'a, C> UserGetLoginProfileCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1748,13 +1706,15 @@ impl<'a, C> UserGetLoginProfileCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2029,25 +1989,15 @@ impl<'a, C> UserImportSshPublicKeyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2055,13 +2005,15 @@ impl<'a, C> UserImportSshPublicKeyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/oslogin1/src/client.rs b/gen/oslogin1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/oslogin1/src/client.rs +++ b/gen/oslogin1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/oslogin1_beta-cli/src/main.rs b/gen/oslogin1_beta-cli/src/main.rs index d56e7bed32..28e5be899b 100644 --- a/gen/oslogin1_beta-cli/src/main.rs +++ b/gen/oslogin1_beta-cli/src/main.rs @@ -67,7 +67,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["system-id", "project-id"].iter().map(|v|*v)); + v.extend(["project-id", "system-id"].iter().map(|v|*v)); v } )); } } diff --git a/gen/oslogin1_beta/src/api.rs b/gen/oslogin1_beta/src/api.rs index 8a5d54c85d..8ac9a426e8 100644 --- a/gen/oslogin1_beta/src/api.rs +++ b/gen/oslogin1_beta/src/api.rs @@ -610,25 +610,15 @@ impl<'a, C> UserProjectDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -636,13 +626,15 @@ impl<'a, C> UserProjectDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -877,25 +869,15 @@ impl<'a, C> UserSshPublicKeyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -903,13 +885,15 @@ impl<'a, C> UserSshPublicKeyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1144,25 +1128,15 @@ impl<'a, C> UserSshPublicKeyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1170,13 +1144,15 @@ impl<'a, C> UserSshPublicKeyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1437,25 +1413,15 @@ impl<'a, C> UserSshPublicKeyPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1463,13 +1429,15 @@ impl<'a, C> UserSshPublicKeyPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1730,25 +1698,15 @@ impl<'a, C> UserGetLoginProfileCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1756,13 +1714,15 @@ impl<'a, C> UserGetLoginProfileCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2037,25 +1997,15 @@ impl<'a, C> UserImportSshPublicKeyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2063,13 +2013,15 @@ impl<'a, C> UserImportSshPublicKeyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/oslogin1_beta/src/client.rs b/gen/oslogin1_beta/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/oslogin1_beta/src/client.rs +++ b/gen/oslogin1_beta/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/pagespeedonline2-cli/src/main.rs b/gen/pagespeedonline2-cli/src/main.rs index 33e9190478..9d87060ba2 100644 --- a/gen/pagespeedonline2-cli/src/main.rs +++ b/gen/pagespeedonline2-cli/src/main.rs @@ -76,7 +76,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter-third-party-resources", "screenshot", "locale", "rule", "strategy"].iter().map(|v|*v)); + v.extend(["filter-third-party-resources", "locale", "rule", "screenshot", "strategy"].iter().map(|v|*v)); v } )); } } diff --git a/gen/pagespeedonline2/src/api.rs b/gen/pagespeedonline2/src/api.rs index 820165b041..cb40188fbf 100644 --- a/gen/pagespeedonline2/src/api.rs +++ b/gen/pagespeedonline2/src/api.rs @@ -673,25 +673,15 @@ impl<'a, C> PagespeedapiRunpagespeedCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -699,13 +689,15 @@ impl<'a, C> PagespeedapiRunpagespeedCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/pagespeedonline2/src/client.rs b/gen/pagespeedonline2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/pagespeedonline2/src/client.rs +++ b/gen/pagespeedonline2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/pagespeedonline4-cli/src/main.rs b/gen/pagespeedonline4-cli/src/main.rs index 9d58bf0d66..6fcf70134a 100644 --- a/gen/pagespeedonline4-cli/src/main.rs +++ b/gen/pagespeedonline4-cli/src/main.rs @@ -85,7 +85,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["rule", "utm-source", "strategy", "locale", "utm-campaign", "screenshot", "filter-third-party-resources", "snapshots"].iter().map(|v|*v)); + v.extend(["filter-third-party-resources", "locale", "rule", "screenshot", "snapshots", "strategy", "utm-campaign", "utm-source"].iter().map(|v|*v)); v } )); } } diff --git a/gen/pagespeedonline4/src/api.rs b/gen/pagespeedonline4/src/api.rs index 1ba34951ae..9dcb36e34b 100644 --- a/gen/pagespeedonline4/src/api.rs +++ b/gen/pagespeedonline4/src/api.rs @@ -782,25 +782,15 @@ impl<'a, C> PagespeedapiRunpagespeedCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -808,13 +798,15 @@ impl<'a, C> PagespeedapiRunpagespeedCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/pagespeedonline4/src/client.rs b/gen/pagespeedonline4/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/pagespeedonline4/src/client.rs +++ b/gen/pagespeedonline4/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/pagespeedonline5-cli/src/main.rs b/gen/pagespeedonline5-cli/src/main.rs index 724ab6a760..e0e0fd2915 100644 --- a/gen/pagespeedonline5-cli/src/main.rs +++ b/gen/pagespeedonline5-cli/src/main.rs @@ -79,7 +79,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["utm-source", "captcha-token", "strategy", "locale", "utm-campaign", "category"].iter().map(|v|*v)); + v.extend(["captcha-token", "category", "locale", "strategy", "utm-campaign", "utm-source"].iter().map(|v|*v)); v } )); } } diff --git a/gen/pagespeedonline5/src/api.rs b/gen/pagespeedonline5/src/api.rs index 0e6e06d9df..991535235f 100644 --- a/gen/pagespeedonline5/src/api.rs +++ b/gen/pagespeedonline5/src/api.rs @@ -838,25 +838,15 @@ impl<'a, C> PagespeedapiRunpagespeedCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -864,13 +854,15 @@ impl<'a, C> PagespeedapiRunpagespeedCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/pagespeedonline5/src/client.rs b/gen/pagespeedonline5/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/pagespeedonline5/src/client.rs +++ b/gen/pagespeedonline5/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/partners2-cli/src/main.rs b/gen/partners2-cli/src/main.rs index f2756f664a..0442126f68 100644 --- a/gen/partners2-cli/src/main.rs +++ b/gen/partners2-cli/src/main.rs @@ -88,7 +88,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["request-metadata-partners-session-id", "request-metadata-user-overrides-user-id", "request-metadata-traffic-source-traffic-sub-id", "page-size", "page-token", "request-metadata-locale", "request-metadata-user-overrides-ip-address", "request-metadata-experiment-ids", "request-metadata-traffic-source-traffic-source-id"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "request-metadata-experiment-ids", "request-metadata-locale", "request-metadata-partners-session-id", "request-metadata-traffic-source-traffic-source-id", "request-metadata-traffic-source-traffic-sub-id", "request-metadata-user-overrides-ip-address", "request-metadata-user-overrides-user-id"].iter().map(|v|*v)); v } )); } } @@ -262,7 +262,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["order-by", "request-metadata-partners-session-id", "view", "request-metadata-user-overrides-user-id", "currency-code", "request-metadata-traffic-source-traffic-sub-id", "request-metadata-locale", "address", "request-metadata-user-overrides-ip-address", "request-metadata-experiment-ids", "request-metadata-traffic-source-traffic-source-id"].iter().map(|v|*v)); + v.extend(["address", "currency-code", "order-by", "request-metadata-experiment-ids", "request-metadata-locale", "request-metadata-partners-session-id", "request-metadata-traffic-source-traffic-source-id", "request-metadata-traffic-source-traffic-sub-id", "request-metadata-user-overrides-ip-address", "request-metadata-user-overrides-user-id", "view"].iter().map(|v|*v)); v } )); } } @@ -494,7 +494,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "max-monthly-budget-currency-code", "request-metadata-locale", "order-by", "specializations", "language-codes", "min-monthly-budget-units", "services", "company-name", "gps-motivations", "min-monthly-budget-currency-code", "view", "request-metadata-traffic-source-traffic-sub-id", "max-monthly-budget-units", "min-monthly-budget-nanos", "page-token", "address", "request-metadata-user-overrides-ip-address", "request-metadata-experiment-ids", "request-metadata-traffic-source-traffic-source-id", "website-url", "max-monthly-budget-nanos", "request-metadata-partners-session-id", "request-metadata-user-overrides-user-id", "industries"].iter().map(|v|*v)); + v.extend(["address", "company-name", "gps-motivations", "industries", "language-codes", "max-monthly-budget-currency-code", "max-monthly-budget-nanos", "max-monthly-budget-units", "min-monthly-budget-currency-code", "min-monthly-budget-nanos", "min-monthly-budget-units", "order-by", "page-size", "page-token", "request-metadata-experiment-ids", "request-metadata-locale", "request-metadata-partners-session-id", "request-metadata-traffic-source-traffic-source-id", "request-metadata-traffic-source-traffic-sub-id", "request-metadata-user-overrides-ip-address", "request-metadata-user-overrides-user-id", "services", "specializations", "view", "website-url"].iter().map(|v|*v)); v } )); } } @@ -574,7 +574,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["order-by", "request-metadata-partners-session-id", "request-metadata-user-overrides-user-id", "request-metadata-traffic-source-traffic-sub-id", "page-size", "page-token", "request-metadata-locale", "request-metadata-user-overrides-ip-address", "request-metadata-experiment-ids", "request-metadata-traffic-source-traffic-source-id"].iter().map(|v|*v)); + v.extend(["order-by", "page-size", "page-token", "request-metadata-experiment-ids", "request-metadata-locale", "request-metadata-partners-session-id", "request-metadata-traffic-source-traffic-source-id", "request-metadata-traffic-source-traffic-sub-id", "request-metadata-user-overrides-ip-address", "request-metadata-user-overrides-user-id"].iter().map(|v|*v)); v } )); } } @@ -645,7 +645,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["request-metadata-partners-session-id", "request-metadata-user-overrides-user-id", "request-metadata-traffic-source-traffic-sub-id", "request-metadata-locale", "request-metadata-user-overrides-ip-address", "request-metadata-experiment-ids", "request-metadata-traffic-source-traffic-source-id"].iter().map(|v|*v)); + v.extend(["request-metadata-experiment-ids", "request-metadata-locale", "request-metadata-partners-session-id", "request-metadata-traffic-source-traffic-source-id", "request-metadata-traffic-source-traffic-sub-id", "request-metadata-user-overrides-ip-address", "request-metadata-user-overrides-user-id"].iter().map(|v|*v)); v } )); } } @@ -786,7 +786,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["request-metadata-partners-session-id", "request-metadata-user-overrides-user-id", "request-metadata-experiment-ids", "request-metadata-traffic-source-traffic-sub-id", "request-metadata-locale", "request-metadata-user-overrides-ip-address", "update-mask", "request-metadata-traffic-source-traffic-source-id"].iter().map(|v|*v)); + v.extend(["request-metadata-experiment-ids", "request-metadata-locale", "request-metadata-partners-session-id", "request-metadata-traffic-source-traffic-source-id", "request-metadata-traffic-source-traffic-sub-id", "request-metadata-user-overrides-ip-address", "request-metadata-user-overrides-user-id", "update-mask"].iter().map(|v|*v)); v } )); } } @@ -909,7 +909,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["request-metadata-partners-session-id", "request-metadata-user-overrides-user-id", "request-metadata-experiment-ids", "request-metadata-traffic-source-traffic-sub-id", "request-metadata-locale", "request-metadata-user-overrides-ip-address", "update-mask", "request-metadata-traffic-source-traffic-source-id"].iter().map(|v|*v)); + v.extend(["request-metadata-experiment-ids", "request-metadata-locale", "request-metadata-partners-session-id", "request-metadata-traffic-source-traffic-source-id", "request-metadata-traffic-source-traffic-sub-id", "request-metadata-user-overrides-ip-address", "request-metadata-user-overrides-user-id", "update-mask"].iter().map(|v|*v)); v } )); } } @@ -992,7 +992,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["order-by", "request-metadata-partners-session-id", "entire-company", "request-metadata-user-overrides-user-id", "request-metadata-traffic-source-traffic-sub-id", "page-size", "page-token", "request-metadata-locale", "request-metadata-user-overrides-ip-address", "request-metadata-experiment-ids", "request-metadata-traffic-source-traffic-source-id"].iter().map(|v|*v)); + v.extend(["entire-company", "order-by", "page-size", "page-token", "request-metadata-experiment-ids", "request-metadata-locale", "request-metadata-partners-session-id", "request-metadata-traffic-source-traffic-source-id", "request-metadata-traffic-source-traffic-sub-id", "request-metadata-user-overrides-ip-address", "request-metadata-user-overrides-user-id"].iter().map(|v|*v)); v } )); } } @@ -1063,7 +1063,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["request-metadata-partners-session-id", "request-metadata-user-overrides-user-id", "request-metadata-traffic-source-traffic-sub-id", "request-metadata-locale", "request-metadata-user-overrides-ip-address", "request-metadata-experiment-ids", "request-metadata-traffic-source-traffic-source-id"].iter().map(|v|*v)); + v.extend(["request-metadata-experiment-ids", "request-metadata-locale", "request-metadata-partners-session-id", "request-metadata-traffic-source-traffic-source-id", "request-metadata-traffic-source-traffic-sub-id", "request-metadata-user-overrides-ip-address", "request-metadata-user-overrides-user-id"].iter().map(|v|*v)); v } )); } } @@ -1243,7 +1243,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["request-metadata-partners-session-id", "request-metadata-user-overrides-user-id", "request-metadata-traffic-source-traffic-sub-id", "request-metadata-locale", "request-metadata-user-overrides-ip-address", "request-metadata-experiment-ids", "request-metadata-traffic-source-traffic-source-id"].iter().map(|v|*v)); + v.extend(["request-metadata-experiment-ids", "request-metadata-locale", "request-metadata-partners-session-id", "request-metadata-traffic-source-traffic-source-id", "request-metadata-traffic-source-traffic-sub-id", "request-metadata-user-overrides-ip-address", "request-metadata-user-overrides-user-id"].iter().map(|v|*v)); v } )); } } @@ -1374,7 +1374,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["request-metadata-partners-session-id", "request-metadata-user-overrides-user-id", "request-metadata-traffic-source-traffic-sub-id", "request-metadata-locale", "request-metadata-user-overrides-ip-address", "request-metadata-experiment-ids", "request-metadata-traffic-source-traffic-source-id"].iter().map(|v|*v)); + v.extend(["request-metadata-experiment-ids", "request-metadata-locale", "request-metadata-partners-session-id", "request-metadata-traffic-source-traffic-source-id", "request-metadata-traffic-source-traffic-sub-id", "request-metadata-user-overrides-ip-address", "request-metadata-user-overrides-user-id"].iter().map(|v|*v)); v } )); } } @@ -1445,7 +1445,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["request-metadata-partners-session-id", "request-metadata-user-overrides-user-id", "request-metadata-traffic-source-traffic-sub-id", "request-metadata-locale", "request-metadata-user-overrides-ip-address", "request-metadata-experiment-ids", "request-metadata-traffic-source-traffic-source-id"].iter().map(|v|*v)); + v.extend(["request-metadata-experiment-ids", "request-metadata-locale", "request-metadata-partners-session-id", "request-metadata-traffic-source-traffic-source-id", "request-metadata-traffic-source-traffic-sub-id", "request-metadata-user-overrides-ip-address", "request-metadata-user-overrides-user-id"].iter().map(|v|*v)); v } )); } } @@ -1519,7 +1519,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["request-metadata-partners-session-id", "request-metadata-user-overrides-user-id", "request-metadata-traffic-source-traffic-sub-id", "user-view", "request-metadata-locale", "request-metadata-user-overrides-ip-address", "request-metadata-experiment-ids", "request-metadata-traffic-source-traffic-source-id"].iter().map(|v|*v)); + v.extend(["request-metadata-experiment-ids", "request-metadata-locale", "request-metadata-partners-session-id", "request-metadata-traffic-source-traffic-source-id", "request-metadata-traffic-source-traffic-sub-id", "request-metadata-user-overrides-ip-address", "request-metadata-user-overrides-user-id", "user-view"].iter().map(|v|*v)); v } )); } } @@ -1651,7 +1651,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["request-metadata-partners-session-id", "request-metadata-user-overrides-user-id", "request-metadata-traffic-source-traffic-sub-id", "request-metadata-locale", "request-metadata-user-overrides-ip-address", "request-metadata-experiment-ids", "request-metadata-traffic-source-traffic-source-id"].iter().map(|v|*v)); + v.extend(["request-metadata-experiment-ids", "request-metadata-locale", "request-metadata-partners-session-id", "request-metadata-traffic-source-traffic-source-id", "request-metadata-traffic-source-traffic-sub-id", "request-metadata-user-overrides-ip-address", "request-metadata-user-overrides-user-id"].iter().map(|v|*v)); v } )); } } diff --git a/gen/partners2/src/api.rs b/gen/partners2/src/api.rs index 995d2c823e..6ffaa28d7f 100644 --- a/gen/partners2/src/api.rs +++ b/gen/partners2/src/api.rs @@ -2502,25 +2502,15 @@ impl<'a, C> UserEventLogCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2528,13 +2518,15 @@ impl<'a, C> UserEventLogCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2733,25 +2725,15 @@ impl<'a, C> ClientMessageLogCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2759,13 +2741,15 @@ impl<'a, C> ClientMessageLogCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2994,25 +2978,15 @@ impl<'a, C> LeadListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3020,13 +2994,15 @@ impl<'a, C> LeadListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3330,25 +3306,15 @@ impl<'a, C> OfferHistoryListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3356,13 +3322,15 @@ impl<'a, C> OfferHistoryListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3652,25 +3620,15 @@ impl<'a, C> OfferListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3678,13 +3636,15 @@ impl<'a, C> OfferListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3953,25 +3913,15 @@ impl<'a, C> AnalyticListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3979,13 +3929,15 @@ impl<'a, C> AnalyticListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4269,25 +4221,15 @@ impl<'a, C> UserStateListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4295,13 +4237,15 @@ impl<'a, C> UserStateListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4585,25 +4529,15 @@ impl<'a, C> MethodUpdateLeadCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4611,13 +4545,15 @@ impl<'a, C> MethodUpdateLeadCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4920,25 +4856,15 @@ impl<'a, C> MethodUpdateCompanyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4946,13 +4872,15 @@ impl<'a, C> MethodUpdateCompanyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5228,25 +5156,15 @@ impl<'a, C> MethodGetPartnersstatuCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5254,13 +5172,15 @@ impl<'a, C> MethodGetPartnersstatuCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5525,25 +5445,15 @@ impl<'a, C> CompanyLeadCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5551,13 +5461,15 @@ impl<'a, C> CompanyLeadCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5823,25 +5735,15 @@ impl<'a, C> CompanyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5849,13 +5751,15 @@ impl<'a, C> CompanyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6258,25 +6162,15 @@ impl<'a, C> CompanyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6284,13 +6178,15 @@ impl<'a, C> CompanyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6730,25 +6626,15 @@ impl<'a, C> UserUpdateProfileCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6756,13 +6642,15 @@ impl<'a, C> UserUpdateProfileCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7073,25 +6961,15 @@ impl<'a, C> UserCreateCompanyRelationCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7099,13 +6977,15 @@ impl<'a, C> UserCreateCompanyRelationCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7406,25 +7286,15 @@ impl<'a, C> UserDeleteCompanyRelationCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7432,13 +7302,15 @@ impl<'a, C> UserDeleteCompanyRelationCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7735,25 +7607,15 @@ impl<'a, C> UserGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7761,13 +7623,15 @@ impl<'a, C> UserGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/partners2/src/client.rs b/gen/partners2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/partners2/src/client.rs +++ b/gen/partners2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/people1-cli/src/main.rs b/gen/people1-cli/src/main.rs index f7ed613a46..dcca687031 100644 --- a/gen/people1-cli/src/main.rs +++ b/gen/people1-cli/src/main.rs @@ -70,7 +70,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-members", "group-fields", "resource-names"].iter().map(|v|*v)); + v.extend(["group-fields", "max-members", "resource-names"].iter().map(|v|*v)); v } )); } } @@ -279,7 +279,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-members", "group-fields"].iter().map(|v|*v)); + v.extend(["group-fields", "max-members"].iter().map(|v|*v)); v } )); } } @@ -344,7 +344,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sync-token", "group-fields", "page-token", "page-size"].iter().map(|v|*v)); + v.extend(["group-fields", "page-size", "page-token", "sync-token"].iter().map(|v|*v)); v } )); } } @@ -680,7 +680,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["request-sync-token", "read-mask", "page-size", "page-token", "sync-token"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "read-mask", "request-sync-token", "sync-token"].iter().map(|v|*v)); v } )); } } @@ -742,7 +742,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["query", "read-mask", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "query", "read-mask"].iter().map(|v|*v)); v } )); } } @@ -1077,7 +1077,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["request-sync-token", "request-mask-include-field", "sources", "person-fields", "sort-order", "page-size", "page-token", "sync-token"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "person-fields", "request-mask-include-field", "request-sync-token", "sort-order", "sources", "sync-token"].iter().map(|v|*v)); v } )); } } @@ -1413,7 +1413,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["person-fields", "request-mask-include-field", "sources", "resource-names"].iter().map(|v|*v)); + v.extend(["person-fields", "request-mask-include-field", "resource-names", "sources"].iter().map(|v|*v)); v } )); } } @@ -1487,7 +1487,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["request-sync-token", "sources", "merge-sources", "read-mask", "page-size", "page-token", "sync-token"].iter().map(|v|*v)); + v.extend(["merge-sources", "page-size", "page-token", "read-mask", "request-sync-token", "sources", "sync-token"].iter().map(|v|*v)); v } )); } } @@ -1549,7 +1549,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["query", "read-mask", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "query", "read-mask"].iter().map(|v|*v)); v } )); } } @@ -1620,7 +1620,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sources", "merge-sources", "read-mask", "page-size", "page-token", "query"].iter().map(|v|*v)); + v.extend(["merge-sources", "page-size", "page-token", "query", "read-mask", "sources"].iter().map(|v|*v)); v } )); } } @@ -1721,7 +1721,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["person-fields", "update-person-fields", "sources"].iter().map(|v|*v)); + v.extend(["person-fields", "sources", "update-person-fields"].iter().map(|v|*v)); v } )); } } diff --git a/gen/people1/src/api.rs b/gen/people1/src/api.rs index 73bd0c71b2..a5af3ed1b5 100644 --- a/gen/people1/src/api.rs +++ b/gen/people1/src/api.rs @@ -2569,25 +2569,15 @@ impl<'a, C> ContactGroupMemberModifyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2595,13 +2585,15 @@ impl<'a, C> ContactGroupMemberModifyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2835,25 +2827,15 @@ impl<'a, C> ContactGroupBatchGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2861,13 +2843,15 @@ impl<'a, C> ContactGroupBatchGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3108,25 +3092,15 @@ impl<'a, C> ContactGroupCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3134,13 +3108,15 @@ impl<'a, C> ContactGroupCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3379,25 +3355,15 @@ impl<'a, C> ContactGroupDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3405,13 +3371,15 @@ impl<'a, C> ContactGroupDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3663,25 +3631,15 @@ impl<'a, C> ContactGroupGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3689,13 +3647,15 @@ impl<'a, C> ContactGroupGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3937,25 +3897,15 @@ impl<'a, C> ContactGroupListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3963,13 +3913,15 @@ impl<'a, C> ContactGroupListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4243,25 +4195,15 @@ impl<'a, C> ContactGroupUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4269,13 +4211,15 @@ impl<'a, C> ContactGroupUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4540,25 +4484,15 @@ impl<'a, C> OtherContactCopyOtherContactToMyContactsGroupCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4566,13 +4500,15 @@ impl<'a, C> OtherContactCopyOtherContactToMyContactsGroupCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4814,25 +4750,15 @@ impl<'a, C> OtherContactListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4840,13 +4766,15 @@ impl<'a, C> OtherContactListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5094,25 +5022,15 @@ impl<'a, C> OtherContactSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5120,13 +5038,15 @@ impl<'a, C> OtherContactSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5414,25 +5334,15 @@ impl<'a, C> PeopleConnectionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5440,13 +5350,15 @@ impl<'a, C> PeopleConnectionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5732,25 +5644,15 @@ impl<'a, C> PeopleBatchCreateContactCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5758,13 +5660,15 @@ impl<'a, C> PeopleBatchCreateContactCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5992,25 +5896,15 @@ impl<'a, C> PeopleBatchDeleteContactCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6018,13 +5912,15 @@ impl<'a, C> PeopleBatchDeleteContactCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6252,25 +6148,15 @@ impl<'a, C> PeopleBatchUpdateContactCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6278,13 +6164,15 @@ impl<'a, C> PeopleBatchUpdateContactCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6524,25 +6412,15 @@ impl<'a, C> PeopleCreateContactCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6550,13 +6428,15 @@ impl<'a, C> PeopleCreateContactCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6805,25 +6685,15 @@ impl<'a, C> PeopleDeleteContactCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6831,13 +6701,15 @@ impl<'a, C> PeopleDeleteContactCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7084,25 +6956,15 @@ impl<'a, C> PeopleDeleteContactPhotoCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7110,13 +6972,15 @@ impl<'a, C> PeopleDeleteContactPhotoCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7383,25 +7247,15 @@ impl<'a, C> PeopleGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7409,13 +7263,15 @@ impl<'a, C> PeopleGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7669,25 +7525,15 @@ impl<'a, C> PeopleGetBatchGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7695,13 +7541,15 @@ impl<'a, C> PeopleGetBatchGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7968,25 +7816,15 @@ impl<'a, C> PeopleListDirectoryPeopleCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7994,13 +7832,15 @@ impl<'a, C> PeopleListDirectoryPeopleCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8264,25 +8104,15 @@ impl<'a, C> PeopleSearchContactCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8290,13 +8120,15 @@ impl<'a, C> PeopleSearchContactCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8549,25 +8381,15 @@ impl<'a, C> PeopleSearchDirectoryPeopleCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8575,13 +8397,15 @@ impl<'a, C> PeopleSearchDirectoryPeopleCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8888,25 +8712,15 @@ impl<'a, C> PeopleUpdateContactCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8914,13 +8728,15 @@ impl<'a, C> PeopleUpdateContactCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9207,25 +9023,15 @@ impl<'a, C> PeopleUpdateContactPhotoCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9233,13 +9039,15 @@ impl<'a, C> PeopleUpdateContactPhotoCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/people1/src/client.rs b/gen/people1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/people1/src/client.rs +++ b/gen/people1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/photoslibrary1/src/api.rs b/gen/photoslibrary1/src/api.rs index 741c395e73..2b5c12d8e1 100644 --- a/gen/photoslibrary1/src/api.rs +++ b/gen/photoslibrary1/src/api.rs @@ -1822,25 +1822,15 @@ impl<'a, C> AlbumAddEnrichmentCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1848,13 +1838,15 @@ impl<'a, C> AlbumAddEnrichmentCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2119,25 +2111,15 @@ impl<'a, C> AlbumBatchAddMediaItemCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2145,13 +2127,15 @@ impl<'a, C> AlbumBatchAddMediaItemCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2416,25 +2400,15 @@ impl<'a, C> AlbumBatchRemoveMediaItemCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2442,13 +2416,15 @@ impl<'a, C> AlbumBatchRemoveMediaItemCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2686,25 +2662,15 @@ impl<'a, C> AlbumCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2712,13 +2678,15 @@ impl<'a, C> AlbumCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2952,25 +2920,15 @@ impl<'a, C> AlbumGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2978,13 +2936,15 @@ impl<'a, C> AlbumGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3207,25 +3167,15 @@ impl<'a, C> AlbumListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3233,13 +3183,15 @@ impl<'a, C> AlbumListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3511,25 +3463,15 @@ impl<'a, C> AlbumPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3537,13 +3479,15 @@ impl<'a, C> AlbumPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3815,25 +3759,15 @@ impl<'a, C> AlbumShareCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3841,13 +3775,15 @@ impl<'a, C> AlbumShareCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4112,25 +4048,15 @@ impl<'a, C> AlbumUnshareCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4138,13 +4064,15 @@ impl<'a, C> AlbumUnshareCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4382,25 +4310,15 @@ impl<'a, C> MediaItemBatchCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4408,13 +4326,15 @@ impl<'a, C> MediaItemBatchCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4628,25 +4548,15 @@ impl<'a, C> MediaItemBatchGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4654,13 +4564,15 @@ impl<'a, C> MediaItemBatchGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4893,25 +4805,15 @@ impl<'a, C> MediaItemGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4919,13 +4821,15 @@ impl<'a, C> MediaItemGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5143,25 +5047,15 @@ impl<'a, C> MediaItemListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5169,13 +5063,15 @@ impl<'a, C> MediaItemListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5440,25 +5336,15 @@ impl<'a, C> MediaItemPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5466,13 +5352,15 @@ impl<'a, C> MediaItemPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5717,25 +5605,15 @@ impl<'a, C> MediaItemSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5743,13 +5621,15 @@ impl<'a, C> MediaItemSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5983,25 +5863,15 @@ impl<'a, C> SharedAlbumGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6009,13 +5879,15 @@ impl<'a, C> SharedAlbumGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6244,25 +6116,15 @@ impl<'a, C> SharedAlbumJoinCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6270,13 +6132,15 @@ impl<'a, C> SharedAlbumJoinCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6504,25 +6368,15 @@ impl<'a, C> SharedAlbumLeaveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6530,13 +6384,15 @@ impl<'a, C> SharedAlbumLeaveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6758,25 +6614,15 @@ impl<'a, C> SharedAlbumListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6784,13 +6630,15 @@ impl<'a, C> SharedAlbumListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/photoslibrary1/src/client.rs b/gen/photoslibrary1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/photoslibrary1/src/client.rs +++ b/gen/photoslibrary1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/playablelocations3/src/api.rs b/gen/playablelocations3/src/api.rs index 6de7029cd4..60a85cf241 100644 --- a/gen/playablelocations3/src/api.rs +++ b/gen/playablelocations3/src/api.rs @@ -884,25 +884,15 @@ impl<'a, C> MethodLogImpressionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -910,13 +900,15 @@ impl<'a, C> MethodLogImpressionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1116,25 +1108,15 @@ impl<'a, C> MethodLogPlayerReportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1142,13 +1124,15 @@ impl<'a, C> MethodLogPlayerReportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1349,25 +1333,15 @@ impl<'a, C> MethodSamplePlayableLocationCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1375,13 +1349,15 @@ impl<'a, C> MethodSamplePlayableLocationCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/playablelocations3/src/client.rs b/gen/playablelocations3/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/playablelocations3/src/client.rs +++ b/gen/playablelocations3/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/playcustomapp1/src/api.rs b/gen/playcustomapp1/src/api.rs index 3505b98d1e..3ded00aaa4 100644 --- a/gen/playcustomapp1/src/api.rs +++ b/gen/playcustomapp1/src/api.rs @@ -468,25 +468,15 @@ impl<'a, C> AccountCustomAppCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -494,7 +484,7 @@ impl<'a, C> AccountCustomAppCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -506,7 +496,7 @@ impl<'a, C> AccountCustomAppCreateCall<'a, C> where C: BorrowMut AccountCustomAppCreateCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/playcustomapp1/src/client.rs b/gen/playcustomapp1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/playcustomapp1/src/client.rs +++ b/gen/playcustomapp1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/playmoviespartner1-cli/src/main.rs b/gen/playmoviespartner1-cli/src/main.rs index a04995160d..b68d04c7d1 100644 --- a/gen/playmoviespartner1-cli/src/main.rs +++ b/gen/playmoviespartner1-cli/src/main.rs @@ -140,7 +140,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["alt-id", "title", "page-size", "alt-ids", "pph-names", "page-token", "territories", "video-ids", "studio-names"].iter().map(|v|*v)); + v.extend(["alt-id", "alt-ids", "page-size", "page-token", "pph-names", "studio-names", "territories", "title", "video-ids"].iter().map(|v|*v)); v } )); } } @@ -269,7 +269,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "name", "pph-names", "custom-id", "video-ids", "page-token", "status", "studio-names"].iter().map(|v|*v)); + v.extend(["custom-id", "name", "page-size", "page-token", "pph-names", "status", "studio-names", "video-ids"].iter().map(|v|*v)); v } )); } } @@ -404,7 +404,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["season-ids", "page-size", "mids", "name", "pph-names", "page-token", "video-id", "countries", "video-ids", "studio-names"].iter().map(|v|*v)); + v.extend(["countries", "mids", "name", "page-size", "page-token", "pph-names", "season-ids", "studio-names", "video-id", "video-ids"].iter().map(|v|*v)); v } )); } } diff --git a/gen/playmoviespartner1/src/api.rs b/gen/playmoviespartner1/src/api.rs index 07d6bfcd8d..270a79f01d 100644 --- a/gen/playmoviespartner1/src/api.rs +++ b/gen/playmoviespartner1/src/api.rs @@ -1044,25 +1044,15 @@ impl<'a, C> AccountOrderListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1070,13 +1060,15 @@ impl<'a, C> AccountOrderListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1375,25 +1367,15 @@ impl<'a, C> AccountOrderGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1401,13 +1383,15 @@ impl<'a, C> AccountOrderGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1708,25 +1692,15 @@ impl<'a, C> AccountAvailListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1734,13 +1708,15 @@ impl<'a, C> AccountAvailListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2049,25 +2025,15 @@ impl<'a, C> AccountAvailGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2075,13 +2041,15 @@ impl<'a, C> AccountAvailGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2331,25 +2299,15 @@ impl<'a, C> AccountStoreInfoCountryGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2357,13 +2315,15 @@ impl<'a, C> AccountStoreInfoCountryGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2681,25 +2641,15 @@ impl<'a, C> AccountStoreInfoListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2707,13 +2657,15 @@ impl<'a, C> AccountStoreInfoListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/playmoviespartner1/src/client.rs b/gen/playmoviespartner1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/playmoviespartner1/src/client.rs +++ b/gen/playmoviespartner1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/plus1-cli/src/main.rs b/gen/plus1-cli/src/main.rs index 02ddad31d3..b61eff4c43 100644 --- a/gen/plus1-cli/src/main.rs +++ b/gen/plus1-cli/src/main.rs @@ -298,7 +298,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sort-order", "page-token", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "sort-order"].iter().map(|v|*v)); v } )); } } diff --git a/gen/plus1/src/api.rs b/gen/plus1/src/api.rs index f1169a32dd..205b49660c 100644 --- a/gen/plus1/src/api.rs +++ b/gen/plus1/src/api.rs @@ -1824,25 +1824,15 @@ impl<'a, C> ActivityGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1850,13 +1840,15 @@ impl<'a, C> ActivityGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2095,25 +2087,15 @@ impl<'a, C> ActivityListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2121,13 +2103,15 @@ impl<'a, C> ActivityListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2377,25 +2361,15 @@ impl<'a, C> ActivitySearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2403,13 +2377,15 @@ impl<'a, C> ActivitySearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2664,25 +2640,15 @@ impl<'a, C> CommentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2690,13 +2656,15 @@ impl<'a, C> CommentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2938,25 +2906,15 @@ impl<'a, C> CommentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2964,13 +2922,15 @@ impl<'a, C> CommentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3218,25 +3178,15 @@ impl<'a, C> PeopleGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3244,13 +3194,15 @@ impl<'a, C> PeopleGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3494,25 +3446,15 @@ impl<'a, C> PeopleListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3520,13 +3462,15 @@ impl<'a, C> PeopleListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3796,25 +3740,15 @@ impl<'a, C> PeopleListByActivityCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3822,13 +3756,15 @@ impl<'a, C> PeopleListByActivityCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4073,25 +4009,15 @@ impl<'a, C> PeopleSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4099,13 +4025,15 @@ impl<'a, C> PeopleSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/plus1/src/client.rs b/gen/plus1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/plus1/src/client.rs +++ b/gen/plus1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/plusdomains1/src/api.rs b/gen/plusdomains1/src/api.rs index 60fcccad7a..024c799024 100644 --- a/gen/plusdomains1/src/api.rs +++ b/gen/plusdomains1/src/api.rs @@ -2293,25 +2293,15 @@ impl<'a, C> ActivityGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2319,13 +2309,15 @@ impl<'a, C> ActivityGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2564,25 +2556,15 @@ impl<'a, C> ActivityListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2590,13 +2572,15 @@ impl<'a, C> ActivityListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2857,25 +2841,15 @@ impl<'a, C> AudienceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2883,13 +2857,15 @@ impl<'a, C> AudienceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3140,25 +3116,15 @@ impl<'a, C> CircleListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3166,13 +3132,15 @@ impl<'a, C> CircleListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3413,25 +3381,15 @@ impl<'a, C> CommentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3439,13 +3397,15 @@ impl<'a, C> CommentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3687,25 +3647,15 @@ impl<'a, C> CommentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3713,13 +3663,15 @@ impl<'a, C> CommentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4033,25 +3985,15 @@ impl<'a, C> MediaInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4059,7 +4001,7 @@ impl<'a, C> MediaInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -4069,7 +4011,7 @@ impl<'a, C> MediaInsertCall<'a, C> where C: BorrowMut MediaInsertCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4379,25 +4323,15 @@ impl<'a, C> PeopleGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4405,13 +4339,15 @@ impl<'a, C> PeopleGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4655,25 +4591,15 @@ impl<'a, C> PeopleListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4681,13 +4607,15 @@ impl<'a, C> PeopleListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4957,25 +4885,15 @@ impl<'a, C> PeopleListByActivityCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4983,13 +4901,15 @@ impl<'a, C> PeopleListByActivityCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/plusdomains1/src/client.rs b/gen/plusdomains1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/plusdomains1/src/client.rs +++ b/gen/plusdomains1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/policysimulator1-cli/src/main.rs b/gen/policysimulator1-cli/src/main.rs index 2c54ca2a7b..bc46b8b8e9 100644 --- a/gen/policysimulator1-cli/src/main.rs +++ b/gen/policysimulator1-cli/src/main.rs @@ -333,7 +333,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "page-size", "name", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "name", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/policysimulator1/src/api.rs b/gen/policysimulator1/src/api.rs index a2d7b2f0a6..290327999c 100644 --- a/gen/policysimulator1/src/api.rs +++ b/gen/policysimulator1/src/api.rs @@ -1139,25 +1139,15 @@ impl<'a, C> FolderLocationReplayResultListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1165,13 +1155,15 @@ impl<'a, C> FolderLocationReplayResultListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1441,25 +1433,15 @@ impl<'a, C> FolderLocationReplayCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1467,13 +1449,15 @@ impl<'a, C> FolderLocationReplayCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1717,25 +1701,15 @@ impl<'a, C> FolderLocationReplayGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1743,13 +1717,15 @@ impl<'a, C> FolderLocationReplayGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1984,25 +1960,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2010,13 +1976,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2244,25 +2212,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2270,13 +2228,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2539,25 +2499,15 @@ impl<'a, C> OrganizationLocationReplayResultListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2565,13 +2515,15 @@ impl<'a, C> OrganizationLocationReplayResultListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2841,25 +2793,15 @@ impl<'a, C> OrganizationLocationReplayCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2867,13 +2809,15 @@ impl<'a, C> OrganizationLocationReplayCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3117,25 +3061,15 @@ impl<'a, C> OrganizationLocationReplayGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3143,13 +3077,15 @@ impl<'a, C> OrganizationLocationReplayGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3394,25 +3330,15 @@ impl<'a, C> ProjectLocationReplayResultListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3420,13 +3346,15 @@ impl<'a, C> ProjectLocationReplayResultListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3696,25 +3624,15 @@ impl<'a, C> ProjectLocationReplayCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3722,13 +3640,15 @@ impl<'a, C> ProjectLocationReplayCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3972,25 +3892,15 @@ impl<'a, C> ProjectLocationReplayGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3998,13 +3908,15 @@ impl<'a, C> ProjectLocationReplayGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/policysimulator1/src/client.rs b/gen/policysimulator1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/policysimulator1/src/client.rs +++ b/gen/policysimulator1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/policytroubleshooter1/src/api.rs b/gen/policytroubleshooter1/src/api.rs index c66818d15c..66fca8ae33 100644 --- a/gen/policytroubleshooter1/src/api.rs +++ b/gen/policytroubleshooter1/src/api.rs @@ -584,25 +584,15 @@ impl<'a, C> IamTroubleshootCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -610,13 +600,15 @@ impl<'a, C> IamTroubleshootCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/policytroubleshooter1/src/client.rs b/gen/policytroubleshooter1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/policytroubleshooter1/src/client.rs +++ b/gen/policytroubleshooter1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/prediction1d6-cli/src/main.rs b/gen/prediction1d6-cli/src/main.rs index 1fe1fd1f71..53ca71b677 100644 --- a/gen/prediction1d6-cli/src/main.rs +++ b/gen/prediction1d6-cli/src/main.rs @@ -389,7 +389,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/prediction1d6/src/api.rs b/gen/prediction1d6/src/api.rs index d06fbfe515..3fa9fb8883 100644 --- a/gen/prediction1d6/src/api.rs +++ b/gen/prediction1d6/src/api.rs @@ -1065,25 +1065,15 @@ impl<'a, C> HostedmodelPredictCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1091,13 +1081,15 @@ impl<'a, C> HostedmodelPredictCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1345,25 +1337,15 @@ impl<'a, C> TrainedmodelAnalyzeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1371,13 +1353,15 @@ impl<'a, C> TrainedmodelAnalyzeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1615,25 +1599,15 @@ impl<'a, C> TrainedmodelDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1641,11 +1615,11 @@ impl<'a, C> TrainedmodelDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -1878,25 +1852,15 @@ impl<'a, C> TrainedmodelGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1904,13 +1868,15 @@ impl<'a, C> TrainedmodelGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2168,25 +2134,15 @@ impl<'a, C> TrainedmodelInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2194,13 +2150,15 @@ impl<'a, C> TrainedmodelInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2446,25 +2404,15 @@ impl<'a, C> TrainedmodelListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2472,13 +2420,15 @@ impl<'a, C> TrainedmodelListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2742,25 +2692,15 @@ impl<'a, C> TrainedmodelPredictCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2768,13 +2708,15 @@ impl<'a, C> TrainedmodelPredictCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3043,25 +2985,15 @@ impl<'a, C> TrainedmodelUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3069,13 +3001,15 @@ impl<'a, C> TrainedmodelUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/prediction1d6/src/client.rs b/gen/prediction1d6/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/prediction1d6/src/client.rs +++ b/gen/prediction1d6/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/privateca1_beta1-cli/src/main.rs b/gen/privateca1_beta1-cli/src/main.rs index eb736ccd9f..629a840dcd 100644 --- a/gen/privateca1_beta1-cli/src/main.rs +++ b/gen/privateca1_beta1-cli/src/main.rs @@ -269,7 +269,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -832,7 +832,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1660,7 +1660,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2289,7 +2289,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2539,7 +2539,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2712,7 +2712,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/privateca1_beta1/src/api.rs b/gen/privateca1_beta1/src/api.rs index 1757d28f0d..eb2231ecb7 100644 --- a/gen/privateca1_beta1/src/api.rs +++ b/gen/privateca1_beta1/src/api.rs @@ -2360,25 +2360,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityCertificateRevocationListGetCall< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2386,13 +2376,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityCertificateRevocationListGetCall< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2632,25 +2624,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityCertificateRevocationListGetIamPo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2658,13 +2640,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityCertificateRevocationListGetIamPo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2926,25 +2910,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityCertificateRevocationListListCall return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2952,13 +2926,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityCertificateRevocationListListCall } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3252,25 +3228,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityCertificateRevocationListPatchCal return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3278,13 +3244,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityCertificateRevocationListPatchCal } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3563,25 +3531,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityCertificateRevocationListSetIamPo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3589,13 +3547,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityCertificateRevocationListSetIamPo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3860,25 +3820,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityCertificateRevocationListTestIamP return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3886,13 +3836,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityCertificateRevocationListTestIamP } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4167,25 +4119,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityCertificateCreateCall<'a, C> wher return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4193,13 +4135,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityCertificateCreateCall<'a, C> wher } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4457,25 +4401,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityCertificateGetCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4483,13 +4417,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityCertificateGetCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4744,25 +4680,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityCertificateListCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4770,13 +4696,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityCertificateListCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5070,25 +4998,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityCertificatePatchCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5096,13 +5014,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityCertificatePatchCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5381,25 +5301,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityCertificateRevokeCall<'a, C> wher return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5407,13 +5317,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityCertificateRevokeCall<'a, C> wher } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5678,25 +5590,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityActivateCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5704,13 +5606,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityActivateCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5985,25 +5889,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityCreateCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6011,13 +5905,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityCreateCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6296,25 +6192,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityDisableCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6322,13 +6208,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityDisableCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6593,25 +6481,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityEnableCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6619,13 +6497,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityEnableCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6869,25 +6749,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityFetchCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6895,13 +6765,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityFetchCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7136,25 +7008,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityGetCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7162,13 +7024,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityGetCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7408,25 +7272,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityGetIamPolicyCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7434,13 +7288,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityGetIamPolicyCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7702,25 +7558,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityListCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7728,13 +7574,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityListCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8028,25 +7876,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityPatchCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8054,13 +7892,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityPatchCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8339,25 +8179,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityRestoreCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8365,13 +8195,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityRestoreCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8636,25 +8468,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityScheduleDeleteCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8662,13 +8484,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityScheduleDeleteCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8933,25 +8757,15 @@ impl<'a, C> ProjectLocationCertificateAuthoritySetIamPolicyCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8959,13 +8773,15 @@ impl<'a, C> ProjectLocationCertificateAuthoritySetIamPolicyCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9230,25 +9046,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityTestIamPermissionCall<'a, C> wher return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9256,13 +9062,15 @@ impl<'a, C> ProjectLocationCertificateAuthorityTestIamPermissionCall<'a, C> wher } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9527,25 +9335,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9553,13 +9351,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9803,25 +9603,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9829,13 +9619,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10070,25 +9862,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10096,13 +9878,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10352,25 +10136,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10378,13 +10152,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10640,25 +10416,15 @@ impl<'a, C> ProjectLocationReusableConfigGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10666,13 +10432,15 @@ impl<'a, C> ProjectLocationReusableConfigGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10912,25 +10680,15 @@ impl<'a, C> ProjectLocationReusableConfigGetIamPolicyCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10938,13 +10696,15 @@ impl<'a, C> ProjectLocationReusableConfigGetIamPolicyCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11206,25 +10966,15 @@ impl<'a, C> ProjectLocationReusableConfigListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11232,13 +10982,15 @@ impl<'a, C> ProjectLocationReusableConfigListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11522,25 +11274,15 @@ impl<'a, C> ProjectLocationReusableConfigSetIamPolicyCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11548,13 +11290,15 @@ impl<'a, C> ProjectLocationReusableConfigSetIamPolicyCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11819,25 +11563,15 @@ impl<'a, C> ProjectLocationReusableConfigTestIamPermissionCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11845,13 +11579,15 @@ impl<'a, C> ProjectLocationReusableConfigTestIamPermissionCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12095,25 +11831,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12121,13 +11847,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12377,25 +12105,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12403,13 +12121,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/privateca1_beta1/src/client.rs b/gen/privateca1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/privateca1_beta1/src/client.rs +++ b/gen/privateca1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/prod_tt_sasportal1_alpha1-cli/src/main.rs b/gen/prod_tt_sasportal1_alpha1-cli/src/main.rs index 07ae69d560..1757b57334 100644 --- a/gen/prod_tt_sasportal1_alpha1-cli/src/main.rs +++ b/gen/prod_tt_sasportal1_alpha1-cli/src/main.rs @@ -442,7 +442,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -556,7 +556,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1131,7 +1131,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1707,7 +1707,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1997,7 +1997,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2290,7 +2290,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2404,7 +2404,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2638,7 +2638,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3957,7 +3957,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -4071,7 +4071,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -4646,7 +4646,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -5453,7 +5453,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -5746,7 +5746,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -5860,7 +5860,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -6094,7 +6094,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/prod_tt_sasportal1_alpha1/src/api.rs b/gen/prod_tt_sasportal1_alpha1/src/api.rs index 1fedba20cc..9f98edfbb0 100644 --- a/gen/prod_tt_sasportal1_alpha1/src/api.rs +++ b/gen/prod_tt_sasportal1_alpha1/src/api.rs @@ -2871,25 +2871,15 @@ impl<'a, C> CustomerDeploymentDeviceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2897,13 +2887,15 @@ impl<'a, C> CustomerDeploymentDeviceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3168,25 +3160,15 @@ impl<'a, C> CustomerDeploymentDeviceCreateSignedCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3194,13 +3176,15 @@ impl<'a, C> CustomerDeploymentDeviceCreateSignedCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3459,25 +3443,15 @@ impl<'a, C> CustomerDeploymentDeviceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3485,13 +3459,15 @@ impl<'a, C> CustomerDeploymentDeviceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3768,25 +3744,15 @@ impl<'a, C> CustomerDeploymentCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3794,13 +3760,15 @@ impl<'a, C> CustomerDeploymentCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4044,25 +4012,15 @@ impl<'a, C> CustomerDeploymentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4070,13 +4028,15 @@ impl<'a, C> CustomerDeploymentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4311,25 +4271,15 @@ impl<'a, C> CustomerDeploymentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4337,13 +4287,15 @@ impl<'a, C> CustomerDeploymentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4593,25 +4545,15 @@ impl<'a, C> CustomerDeploymentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4619,13 +4561,15 @@ impl<'a, C> CustomerDeploymentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4902,25 +4846,15 @@ impl<'a, C> CustomerDeploymentMoveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4928,13 +4862,15 @@ impl<'a, C> CustomerDeploymentMoveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5204,25 +5140,15 @@ impl<'a, C> CustomerDeploymentPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5230,13 +5156,15 @@ impl<'a, C> CustomerDeploymentPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5508,25 +5436,15 @@ impl<'a, C> CustomerDeviceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5534,13 +5452,15 @@ impl<'a, C> CustomerDeviceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5805,25 +5725,15 @@ impl<'a, C> CustomerDeviceCreateSignedCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5831,13 +5741,15 @@ impl<'a, C> CustomerDeviceCreateSignedCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6081,25 +5993,15 @@ impl<'a, C> CustomerDeviceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6107,13 +6009,15 @@ impl<'a, C> CustomerDeviceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6348,25 +6252,15 @@ impl<'a, C> CustomerDeviceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6374,13 +6268,15 @@ impl<'a, C> CustomerDeviceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6630,25 +6526,15 @@ impl<'a, C> CustomerDeviceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6656,13 +6542,15 @@ impl<'a, C> CustomerDeviceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6939,25 +6827,15 @@ impl<'a, C> CustomerDeviceMoveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6965,13 +6843,15 @@ impl<'a, C> CustomerDeviceMoveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7241,25 +7121,15 @@ impl<'a, C> CustomerDevicePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7267,13 +7137,15 @@ impl<'a, C> CustomerDevicePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7545,25 +7417,15 @@ impl<'a, C> CustomerDeviceSignDeviceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7571,13 +7433,15 @@ impl<'a, C> CustomerDeviceSignDeviceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7842,25 +7706,15 @@ impl<'a, C> CustomerDeviceUpdateSignedCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7868,13 +7722,15 @@ impl<'a, C> CustomerDeviceUpdateSignedCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8139,25 +7995,15 @@ impl<'a, C> CustomerNodeDeploymentCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8165,13 +8011,15 @@ impl<'a, C> CustomerNodeDeploymentCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8430,25 +8278,15 @@ impl<'a, C> CustomerNodeDeploymentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8456,13 +8294,15 @@ impl<'a, C> CustomerNodeDeploymentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8739,25 +8579,15 @@ impl<'a, C> CustomerNodeDeviceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8765,13 +8595,15 @@ impl<'a, C> CustomerNodeDeviceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9036,25 +8868,15 @@ impl<'a, C> CustomerNodeDeviceCreateSignedCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9062,13 +8884,15 @@ impl<'a, C> CustomerNodeDeviceCreateSignedCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9327,25 +9151,15 @@ impl<'a, C> CustomerNodeDeviceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9353,13 +9167,15 @@ impl<'a, C> CustomerNodeDeviceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9636,25 +9452,15 @@ impl<'a, C> CustomerNodeNodeCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9662,13 +9468,15 @@ impl<'a, C> CustomerNodeNodeCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9927,25 +9735,15 @@ impl<'a, C> CustomerNodeNodeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9953,13 +9751,15 @@ impl<'a, C> CustomerNodeNodeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10236,25 +10036,15 @@ impl<'a, C> CustomerNodeCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10262,13 +10052,15 @@ impl<'a, C> CustomerNodeCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10512,25 +10304,15 @@ impl<'a, C> CustomerNodeDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10538,13 +10320,15 @@ impl<'a, C> CustomerNodeDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10779,25 +10563,15 @@ impl<'a, C> CustomerNodeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10805,13 +10579,15 @@ impl<'a, C> CustomerNodeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11061,25 +10837,15 @@ impl<'a, C> CustomerNodeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11087,13 +10853,15 @@ impl<'a, C> CustomerNodeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11370,25 +11138,15 @@ impl<'a, C> CustomerNodeMoveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11396,13 +11154,15 @@ impl<'a, C> CustomerNodeMoveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11672,25 +11432,15 @@ impl<'a, C> CustomerNodePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11698,13 +11448,15 @@ impl<'a, C> CustomerNodePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11955,25 +11707,15 @@ impl<'a, C> CustomerGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11981,13 +11723,15 @@ impl<'a, C> CustomerGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12205,25 +11949,15 @@ impl<'a, C> CustomerListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12231,13 +11965,15 @@ impl<'a, C> CustomerListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12502,25 +12238,15 @@ impl<'a, C> CustomerPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12528,13 +12254,15 @@ impl<'a, C> CustomerPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12785,25 +12513,15 @@ impl<'a, C> DeploymentDeviceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12811,13 +12529,15 @@ impl<'a, C> DeploymentDeviceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13052,25 +12772,15 @@ impl<'a, C> DeploymentDeviceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13078,13 +12788,15 @@ impl<'a, C> DeploymentDeviceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13340,25 +13052,15 @@ impl<'a, C> DeploymentDeviceMoveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13366,13 +13068,15 @@ impl<'a, C> DeploymentDeviceMoveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13642,25 +13346,15 @@ impl<'a, C> DeploymentDevicePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13668,13 +13362,15 @@ impl<'a, C> DeploymentDevicePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13946,25 +13642,15 @@ impl<'a, C> DeploymentDeviceSignDeviceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13972,13 +13658,15 @@ impl<'a, C> DeploymentDeviceSignDeviceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14243,25 +13931,15 @@ impl<'a, C> DeploymentDeviceUpdateSignedCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14269,13 +13947,15 @@ impl<'a, C> DeploymentDeviceUpdateSignedCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14519,25 +14199,15 @@ impl<'a, C> DeploymentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14545,13 +14215,15 @@ impl<'a, C> DeploymentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14780,25 +14452,15 @@ impl<'a, C> InstallerGenerateSecretCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14806,13 +14468,15 @@ impl<'a, C> InstallerGenerateSecretCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15040,25 +14704,15 @@ impl<'a, C> InstallerValidateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15066,13 +14720,15 @@ impl<'a, C> InstallerValidateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15327,25 +14983,15 @@ impl<'a, C> NodeDeploymentDeviceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15353,13 +14999,15 @@ impl<'a, C> NodeDeploymentDeviceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15624,25 +15272,15 @@ impl<'a, C> NodeDeploymentDeviceCreateSignedCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15650,13 +15288,15 @@ impl<'a, C> NodeDeploymentDeviceCreateSignedCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15915,25 +15555,15 @@ impl<'a, C> NodeDeploymentDeviceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15941,13 +15571,15 @@ impl<'a, C> NodeDeploymentDeviceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16203,25 +15835,15 @@ impl<'a, C> NodeDeploymentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16229,13 +15851,15 @@ impl<'a, C> NodeDeploymentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16470,25 +16094,15 @@ impl<'a, C> NodeDeploymentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16496,13 +16110,15 @@ impl<'a, C> NodeDeploymentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16752,25 +16368,15 @@ impl<'a, C> NodeDeploymentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16778,13 +16384,15 @@ impl<'a, C> NodeDeploymentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17061,25 +16669,15 @@ impl<'a, C> NodeDeploymentMoveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17087,13 +16685,15 @@ impl<'a, C> NodeDeploymentMoveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17363,25 +16963,15 @@ impl<'a, C> NodeDeploymentPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17389,13 +16979,15 @@ impl<'a, C> NodeDeploymentPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17667,25 +17259,15 @@ impl<'a, C> NodeDeviceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17693,13 +17275,15 @@ impl<'a, C> NodeDeviceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17964,25 +17548,15 @@ impl<'a, C> NodeDeviceCreateSignedCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17990,13 +17564,15 @@ impl<'a, C> NodeDeviceCreateSignedCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18240,25 +17816,15 @@ impl<'a, C> NodeDeviceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18266,13 +17832,15 @@ impl<'a, C> NodeDeviceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18507,25 +18075,15 @@ impl<'a, C> NodeDeviceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18533,13 +18091,15 @@ impl<'a, C> NodeDeviceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18789,25 +18349,15 @@ impl<'a, C> NodeDeviceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18815,13 +18365,15 @@ impl<'a, C> NodeDeviceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19098,25 +18650,15 @@ impl<'a, C> NodeDeviceMoveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19124,13 +18666,15 @@ impl<'a, C> NodeDeviceMoveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19400,25 +18944,15 @@ impl<'a, C> NodeDevicePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19426,13 +18960,15 @@ impl<'a, C> NodeDevicePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19704,25 +19240,15 @@ impl<'a, C> NodeDeviceSignDeviceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19730,13 +19256,15 @@ impl<'a, C> NodeDeviceSignDeviceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20001,25 +19529,15 @@ impl<'a, C> NodeDeviceUpdateSignedCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20027,13 +19545,15 @@ impl<'a, C> NodeDeviceUpdateSignedCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20298,25 +19818,15 @@ impl<'a, C> NodeNodeDeploymentCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20324,13 +19834,15 @@ impl<'a, C> NodeNodeDeploymentCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20589,25 +20101,15 @@ impl<'a, C> NodeNodeDeploymentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20615,13 +20117,15 @@ impl<'a, C> NodeNodeDeploymentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20898,25 +20402,15 @@ impl<'a, C> NodeNodeDeviceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20924,13 +20418,15 @@ impl<'a, C> NodeNodeDeviceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21195,25 +20691,15 @@ impl<'a, C> NodeNodeDeviceCreateSignedCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21221,13 +20707,15 @@ impl<'a, C> NodeNodeDeviceCreateSignedCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21486,25 +20974,15 @@ impl<'a, C> NodeNodeDeviceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21512,13 +20990,15 @@ impl<'a, C> NodeNodeDeviceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21795,25 +21275,15 @@ impl<'a, C> NodeNodeNodeCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21821,13 +21291,15 @@ impl<'a, C> NodeNodeNodeCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22086,25 +21558,15 @@ impl<'a, C> NodeNodeNodeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22112,13 +21574,15 @@ impl<'a, C> NodeNodeNodeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22395,25 +21859,15 @@ impl<'a, C> NodeNodeCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22421,13 +21875,15 @@ impl<'a, C> NodeNodeCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22671,25 +22127,15 @@ impl<'a, C> NodeNodeDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22697,13 +22143,15 @@ impl<'a, C> NodeNodeDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22938,25 +22386,15 @@ impl<'a, C> NodeNodeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22964,13 +22402,15 @@ impl<'a, C> NodeNodeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23220,25 +22660,15 @@ impl<'a, C> NodeNodeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23246,13 +22676,15 @@ impl<'a, C> NodeNodeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23529,25 +22961,15 @@ impl<'a, C> NodeNodeMoveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23555,13 +22977,15 @@ impl<'a, C> NodeNodeMoveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23831,25 +23255,15 @@ impl<'a, C> NodeNodePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23857,13 +23271,15 @@ impl<'a, C> NodeNodePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24114,25 +23530,15 @@ impl<'a, C> NodeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24140,13 +23546,15 @@ impl<'a, C> NodeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24375,25 +23783,15 @@ impl<'a, C> PolicyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24401,13 +23799,15 @@ impl<'a, C> PolicyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24635,25 +24035,15 @@ impl<'a, C> PolicySetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24661,13 +24051,15 @@ impl<'a, C> PolicySetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24895,25 +24287,15 @@ impl<'a, C> PolicyTestCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24921,13 +24303,15 @@ impl<'a, C> PolicyTestCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/prod_tt_sasportal1_alpha1/src/client.rs b/gen/prod_tt_sasportal1_alpha1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/prod_tt_sasportal1_alpha1/src/client.rs +++ b/gen/prod_tt_sasportal1_alpha1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/proximitybeacon1_beta1-cli/src/main.rs b/gen/proximitybeacon1_beta1-cli/src/main.rs index deae27d685..ce3c6a733b 100644 --- a/gen/proximitybeacon1_beta1-cli/src/main.rs +++ b/gen/proximitybeacon1_beta1-cli/src/main.rs @@ -767,7 +767,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["project-id", "page-size", "page-token", "q"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "project-id", "q"].iter().map(|v|*v)); v } )); } } diff --git a/gen/proximitybeacon1_beta1/src/api.rs b/gen/proximitybeacon1_beta1/src/api.rs index 3bdefae275..a4d0e679c6 100644 --- a/gen/proximitybeacon1_beta1/src/api.rs +++ b/gen/proximitybeacon1_beta1/src/api.rs @@ -1647,25 +1647,15 @@ impl<'a, C> BeaconinfoGetforobservedCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1673,13 +1663,15 @@ impl<'a, C> BeaconinfoGetforobservedCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1911,25 +1903,15 @@ impl<'a, C> BeaconAttachmentBatchDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1937,13 +1919,15 @@ impl<'a, C> BeaconAttachmentBatchDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2248,25 +2232,15 @@ impl<'a, C> BeaconAttachmentCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2274,13 +2248,15 @@ impl<'a, C> BeaconAttachmentCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2554,25 +2530,15 @@ impl<'a, C> BeaconAttachmentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2580,13 +2546,15 @@ impl<'a, C> BeaconAttachmentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2856,25 +2824,15 @@ impl<'a, C> BeaconAttachmentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2882,13 +2840,15 @@ impl<'a, C> BeaconAttachmentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3177,25 +3137,15 @@ impl<'a, C> BeaconDiagnosticListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3203,13 +3153,15 @@ impl<'a, C> BeaconDiagnosticListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3490,25 +3442,15 @@ impl<'a, C> BeaconActivateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3516,13 +3458,15 @@ impl<'a, C> BeaconActivateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3786,25 +3730,15 @@ impl<'a, C> BeaconDeactivateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3812,13 +3746,15 @@ impl<'a, C> BeaconDeactivateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4082,25 +4018,15 @@ impl<'a, C> BeaconDecommissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4108,13 +4034,15 @@ impl<'a, C> BeaconDecommissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4377,25 +4305,15 @@ impl<'a, C> BeaconDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4403,13 +4321,15 @@ impl<'a, C> BeaconDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4675,25 +4595,15 @@ impl<'a, C> BeaconGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4701,13 +4611,15 @@ impl<'a, C> BeaconGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4958,25 +4870,15 @@ impl<'a, C> BeaconListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4984,13 +4886,15 @@ impl<'a, C> BeaconListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5318,25 +5222,15 @@ impl<'a, C> BeaconRegisterCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5344,13 +5238,15 @@ impl<'a, C> BeaconRegisterCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5631,25 +5527,15 @@ impl<'a, C> BeaconUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5657,13 +5543,15 @@ impl<'a, C> BeaconUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5908,25 +5796,15 @@ impl<'a, C> NamespaceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5934,13 +5812,15 @@ impl<'a, C> NamespaceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6200,25 +6080,15 @@ impl<'a, C> NamespaceUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6226,13 +6096,15 @@ impl<'a, C> NamespaceUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6466,25 +6338,15 @@ impl<'a, C> MethodGetEidparamCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6492,13 +6354,15 @@ impl<'a, C> MethodGetEidparamCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/proximitybeacon1_beta1/src/client.rs b/gen/proximitybeacon1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/proximitybeacon1_beta1/src/client.rs +++ b/gen/proximitybeacon1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/pubsub1-cli/src/main.rs b/gen/pubsub1-cli/src/main.rs index e3879bf2b0..dea49c8d48 100644 --- a/gen/pubsub1-cli/src/main.rs +++ b/gen/pubsub1-cli/src/main.rs @@ -325,7 +325,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["view", "page-size", "page-token"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "view"].iter().map(|v|*v)); v } )); } } diff --git a/gen/pubsub1/src/api.rs b/gen/pubsub1/src/api.rs index 86cd77812a..7d5aeb2ba1 100644 --- a/gen/pubsub1/src/api.rs +++ b/gen/pubsub1/src/api.rs @@ -2077,25 +2077,15 @@ impl<'a, C> ProjectSchemaCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2103,13 +2093,15 @@ impl<'a, C> ProjectSchemaCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2360,25 +2352,15 @@ impl<'a, C> ProjectSchemaDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2386,13 +2368,15 @@ impl<'a, C> ProjectSchemaDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2632,25 +2616,15 @@ impl<'a, C> ProjectSchemaGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2658,13 +2632,15 @@ impl<'a, C> ProjectSchemaGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2911,25 +2887,15 @@ impl<'a, C> ProjectSchemaGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2937,13 +2903,15 @@ impl<'a, C> ProjectSchemaGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3200,25 +3168,15 @@ impl<'a, C> ProjectSchemaListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3226,13 +3184,15 @@ impl<'a, C> ProjectSchemaListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3509,25 +3469,15 @@ impl<'a, C> ProjectSchemaSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3535,13 +3485,15 @@ impl<'a, C> ProjectSchemaSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3806,25 +3758,15 @@ impl<'a, C> ProjectSchemaTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3832,13 +3774,15 @@ impl<'a, C> ProjectSchemaTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4103,25 +4047,15 @@ impl<'a, C> ProjectSchemaValidateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4129,13 +4063,15 @@ impl<'a, C> ProjectSchemaValidateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4400,25 +4336,15 @@ impl<'a, C> ProjectSchemaValidateMessageCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4426,13 +4352,15 @@ impl<'a, C> ProjectSchemaValidateMessageCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4697,25 +4625,15 @@ impl<'a, C> ProjectSnapshotCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4723,13 +4641,15 @@ impl<'a, C> ProjectSnapshotCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4973,25 +4893,15 @@ impl<'a, C> ProjectSnapshotDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4999,13 +4909,15 @@ impl<'a, C> ProjectSnapshotDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5240,25 +5152,15 @@ impl<'a, C> ProjectSnapshotGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5266,13 +5168,15 @@ impl<'a, C> ProjectSnapshotGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5512,25 +5416,15 @@ impl<'a, C> ProjectSnapshotGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5538,13 +5432,15 @@ impl<'a, C> ProjectSnapshotGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5796,25 +5692,15 @@ impl<'a, C> ProjectSnapshotListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5822,13 +5708,15 @@ impl<'a, C> ProjectSnapshotListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6098,25 +5986,15 @@ impl<'a, C> ProjectSnapshotPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6124,13 +6002,15 @@ impl<'a, C> ProjectSnapshotPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6395,25 +6275,15 @@ impl<'a, C> ProjectSnapshotSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6421,13 +6291,15 @@ impl<'a, C> ProjectSnapshotSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6692,25 +6564,15 @@ impl<'a, C> ProjectSnapshotTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6718,13 +6580,15 @@ impl<'a, C> ProjectSnapshotTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6989,25 +6853,15 @@ impl<'a, C> ProjectSubscriptionAcknowledgeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7015,13 +6869,15 @@ impl<'a, C> ProjectSubscriptionAcknowledgeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7286,25 +7142,15 @@ impl<'a, C> ProjectSubscriptionCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7312,13 +7158,15 @@ impl<'a, C> ProjectSubscriptionCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7562,25 +7410,15 @@ impl<'a, C> ProjectSubscriptionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7588,13 +7426,15 @@ impl<'a, C> ProjectSubscriptionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7829,25 +7669,15 @@ impl<'a, C> ProjectSubscriptionDetachCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7855,13 +7685,15 @@ impl<'a, C> ProjectSubscriptionDetachCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8096,25 +7928,15 @@ impl<'a, C> ProjectSubscriptionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8122,13 +7944,15 @@ impl<'a, C> ProjectSubscriptionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8368,25 +8192,15 @@ impl<'a, C> ProjectSubscriptionGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8394,13 +8208,15 @@ impl<'a, C> ProjectSubscriptionGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8652,25 +8468,15 @@ impl<'a, C> ProjectSubscriptionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8678,13 +8484,15 @@ impl<'a, C> ProjectSubscriptionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8954,25 +8762,15 @@ impl<'a, C> ProjectSubscriptionModifyAckDeadlineCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8980,13 +8778,15 @@ impl<'a, C> ProjectSubscriptionModifyAckDeadlineCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9251,25 +9051,15 @@ impl<'a, C> ProjectSubscriptionModifyPushConfigCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9277,13 +9067,15 @@ impl<'a, C> ProjectSubscriptionModifyPushConfigCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9548,25 +9340,15 @@ impl<'a, C> ProjectSubscriptionPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9574,13 +9356,15 @@ impl<'a, C> ProjectSubscriptionPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9845,25 +9629,15 @@ impl<'a, C> ProjectSubscriptionPullCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9871,13 +9645,15 @@ impl<'a, C> ProjectSubscriptionPullCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10142,25 +9918,15 @@ impl<'a, C> ProjectSubscriptionSeekCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10168,13 +9934,15 @@ impl<'a, C> ProjectSubscriptionSeekCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10439,25 +10207,15 @@ impl<'a, C> ProjectSubscriptionSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10465,13 +10223,15 @@ impl<'a, C> ProjectSubscriptionSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10736,25 +10496,15 @@ impl<'a, C> ProjectSubscriptionTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10762,13 +10512,15 @@ impl<'a, C> ProjectSubscriptionTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11022,25 +10774,15 @@ impl<'a, C> ProjectTopicSnapshotListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11048,13 +10790,15 @@ impl<'a, C> ProjectTopicSnapshotListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11313,25 +11057,15 @@ impl<'a, C> ProjectTopicSubscriptionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11339,13 +11073,15 @@ impl<'a, C> ProjectTopicSubscriptionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11615,25 +11351,15 @@ impl<'a, C> ProjectTopicCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11641,13 +11367,15 @@ impl<'a, C> ProjectTopicCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11891,25 +11619,15 @@ impl<'a, C> ProjectTopicDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11917,13 +11635,15 @@ impl<'a, C> ProjectTopicDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12158,25 +11878,15 @@ impl<'a, C> ProjectTopicGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12184,13 +11894,15 @@ impl<'a, C> ProjectTopicGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12430,25 +12142,15 @@ impl<'a, C> ProjectTopicGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12456,13 +12158,15 @@ impl<'a, C> ProjectTopicGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12714,25 +12418,15 @@ impl<'a, C> ProjectTopicListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12740,13 +12434,15 @@ impl<'a, C> ProjectTopicListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13016,25 +12712,15 @@ impl<'a, C> ProjectTopicPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13042,13 +12728,15 @@ impl<'a, C> ProjectTopicPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13313,25 +13001,15 @@ impl<'a, C> ProjectTopicPublishCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13339,13 +13017,15 @@ impl<'a, C> ProjectTopicPublishCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13610,25 +13290,15 @@ impl<'a, C> ProjectTopicSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13636,13 +13306,15 @@ impl<'a, C> ProjectTopicSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13907,25 +13579,15 @@ impl<'a, C> ProjectTopicTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13933,13 +13595,15 @@ impl<'a, C> ProjectTopicTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/pubsub1/src/client.rs b/gen/pubsub1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/pubsub1/src/client.rs +++ b/gen/pubsub1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/pubsub1_beta2-cli/src/main.rs b/gen/pubsub1_beta2-cli/src/main.rs index 4d9cde89b2..ac7ab93061 100644 --- a/gen/pubsub1_beta2-cli/src/main.rs +++ b/gen/pubsub1_beta2-cli/src/main.rs @@ -403,7 +403,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1139,7 +1139,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1368,7 +1368,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/pubsub1_beta2/src/api.rs b/gen/pubsub1_beta2/src/api.rs index 7888db450b..f11e67e3ed 100644 --- a/gen/pubsub1_beta2/src/api.rs +++ b/gen/pubsub1_beta2/src/api.rs @@ -1217,25 +1217,15 @@ impl<'a, C> ProjectSubscriptionAcknowledgeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1243,13 +1233,15 @@ impl<'a, C> ProjectSubscriptionAcknowledgeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1514,25 +1506,15 @@ impl<'a, C> ProjectSubscriptionCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1540,13 +1522,15 @@ impl<'a, C> ProjectSubscriptionCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1790,25 +1774,15 @@ impl<'a, C> ProjectSubscriptionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1816,13 +1790,15 @@ impl<'a, C> ProjectSubscriptionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2057,25 +2033,15 @@ impl<'a, C> ProjectSubscriptionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2083,13 +2049,15 @@ impl<'a, C> ProjectSubscriptionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2329,25 +2297,15 @@ impl<'a, C> ProjectSubscriptionGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2355,13 +2313,15 @@ impl<'a, C> ProjectSubscriptionGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2613,25 +2573,15 @@ impl<'a, C> ProjectSubscriptionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2639,13 +2589,15 @@ impl<'a, C> ProjectSubscriptionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2915,25 +2867,15 @@ impl<'a, C> ProjectSubscriptionModifyAckDeadlineCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2941,13 +2883,15 @@ impl<'a, C> ProjectSubscriptionModifyAckDeadlineCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3212,25 +3156,15 @@ impl<'a, C> ProjectSubscriptionModifyPushConfigCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3238,13 +3172,15 @@ impl<'a, C> ProjectSubscriptionModifyPushConfigCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3509,25 +3445,15 @@ impl<'a, C> ProjectSubscriptionPullCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3535,13 +3461,15 @@ impl<'a, C> ProjectSubscriptionPullCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3806,25 +3734,15 @@ impl<'a, C> ProjectSubscriptionSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3832,13 +3750,15 @@ impl<'a, C> ProjectSubscriptionSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4103,25 +4023,15 @@ impl<'a, C> ProjectSubscriptionTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4129,13 +4039,15 @@ impl<'a, C> ProjectSubscriptionTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4389,25 +4301,15 @@ impl<'a, C> ProjectTopicSubscriptionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4415,13 +4317,15 @@ impl<'a, C> ProjectTopicSubscriptionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4691,25 +4595,15 @@ impl<'a, C> ProjectTopicCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4717,13 +4611,15 @@ impl<'a, C> ProjectTopicCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4967,25 +4863,15 @@ impl<'a, C> ProjectTopicDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4993,13 +4879,15 @@ impl<'a, C> ProjectTopicDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5234,25 +5122,15 @@ impl<'a, C> ProjectTopicGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5260,13 +5138,15 @@ impl<'a, C> ProjectTopicGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5506,25 +5386,15 @@ impl<'a, C> ProjectTopicGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5532,13 +5402,15 @@ impl<'a, C> ProjectTopicGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5790,25 +5662,15 @@ impl<'a, C> ProjectTopicListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5816,13 +5678,15 @@ impl<'a, C> ProjectTopicListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6092,25 +5956,15 @@ impl<'a, C> ProjectTopicPublishCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6118,13 +5972,15 @@ impl<'a, C> ProjectTopicPublishCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6389,25 +6245,15 @@ impl<'a, C> ProjectTopicSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6415,13 +6261,15 @@ impl<'a, C> ProjectTopicSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6686,25 +6534,15 @@ impl<'a, C> ProjectTopicTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6712,13 +6550,15 @@ impl<'a, C> ProjectTopicTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/pubsub1_beta2/src/client.rs b/gen/pubsub1_beta2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/pubsub1_beta2/src/client.rs +++ b/gen/pubsub1_beta2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/pubsublite1-cli/src/main.rs b/gen/pubsublite1-cli/src/main.rs index 01646a9cee..6f90dc7711 100644 --- a/gen/pubsublite1-cli/src/main.rs +++ b/gen/pubsublite1-cli/src/main.rs @@ -102,7 +102,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["subscription-id", "skip-backlog"].iter().map(|v|*v)); + v.extend(["skip-backlog", "subscription-id"].iter().map(|v|*v)); v } )); } } diff --git a/gen/pubsublite1/src/api.rs b/gen/pubsublite1/src/api.rs index cc52d78974..6b8819796e 100644 --- a/gen/pubsublite1/src/api.rs +++ b/gen/pubsublite1/src/api.rs @@ -1120,25 +1120,15 @@ impl<'a, C> AdminProjectLocationSubscriptionCreateCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1146,13 +1136,15 @@ impl<'a, C> AdminProjectLocationSubscriptionCreateCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1410,25 +1402,15 @@ impl<'a, C> AdminProjectLocationSubscriptionDeleteCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1436,13 +1418,15 @@ impl<'a, C> AdminProjectLocationSubscriptionDeleteCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1677,25 +1661,15 @@ impl<'a, C> AdminProjectLocationSubscriptionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1703,13 +1677,15 @@ impl<'a, C> AdminProjectLocationSubscriptionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1954,25 +1930,15 @@ impl<'a, C> AdminProjectLocationSubscriptionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1980,13 +1946,15 @@ impl<'a, C> AdminProjectLocationSubscriptionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2261,25 +2229,15 @@ impl<'a, C> AdminProjectLocationSubscriptionPatchCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2287,13 +2245,15 @@ impl<'a, C> AdminProjectLocationSubscriptionPatchCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2554,25 +2514,15 @@ impl<'a, C> AdminProjectLocationTopicSubscriptionListCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2580,13 +2530,15 @@ impl<'a, C> AdminProjectLocationTopicSubscriptionListCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2861,25 +2813,15 @@ impl<'a, C> AdminProjectLocationTopicCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2887,13 +2829,15 @@ impl<'a, C> AdminProjectLocationTopicCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3144,25 +3088,15 @@ impl<'a, C> AdminProjectLocationTopicDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3170,13 +3104,15 @@ impl<'a, C> AdminProjectLocationTopicDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3411,25 +3347,15 @@ impl<'a, C> AdminProjectLocationTopicGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3437,13 +3363,15 @@ impl<'a, C> AdminProjectLocationTopicGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3678,25 +3606,15 @@ impl<'a, C> AdminProjectLocationTopicGetPartitionCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3704,13 +3622,15 @@ impl<'a, C> AdminProjectLocationTopicGetPartitionCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3955,25 +3875,15 @@ impl<'a, C> AdminProjectLocationTopicListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3981,13 +3891,15 @@ impl<'a, C> AdminProjectLocationTopicListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4262,25 +4174,15 @@ impl<'a, C> AdminProjectLocationTopicPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4288,13 +4190,15 @@ impl<'a, C> AdminProjectLocationTopicPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4555,25 +4459,15 @@ impl<'a, C> CursorProjectLocationSubscriptionCursorListCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4581,13 +4475,15 @@ impl<'a, C> CursorProjectLocationSubscriptionCursorListCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4857,25 +4753,15 @@ impl<'a, C> TopicStatProjectLocationTopicComputeHeadCursorCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4883,13 +4769,15 @@ impl<'a, C> TopicStatProjectLocationTopicComputeHeadCursorCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5154,25 +5042,15 @@ impl<'a, C> TopicStatProjectLocationTopicComputeMessageStatCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5180,13 +5058,15 @@ impl<'a, C> TopicStatProjectLocationTopicComputeMessageStatCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/pubsublite1/src/client.rs b/gen/pubsublite1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/pubsublite1/src/client.rs +++ b/gen/pubsublite1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/qpxexpress1/src/api.rs b/gen/qpxexpress1/src/api.rs index bf0ebe12f6..2eac3ab19d 100644 --- a/gen/qpxexpress1/src/api.rs +++ b/gen/qpxexpress1/src/api.rs @@ -937,25 +937,15 @@ impl<'a, C> TripSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -963,13 +953,15 @@ impl<'a, C> TripSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/qpxexpress1/src/client.rs b/gen/qpxexpress1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/qpxexpress1/src/client.rs +++ b/gen/qpxexpress1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/realtimebidding1-cli/src/main.rs b/gen/realtimebidding1-cli/src/main.rs index 45a40586fe..0325e46b9a 100644 --- a/gen/realtimebidding1-cli/src/main.rs +++ b/gen/realtimebidding1-cli/src/main.rs @@ -73,7 +73,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["view", "page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token", "view"].iter().map(|v|*v)); v } )); } } @@ -268,7 +268,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -379,7 +379,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -998,7 +998,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1720,7 +1720,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["view", "page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token", "view"].iter().map(|v|*v)); v } )); } } @@ -2031,7 +2031,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2375,7 +2375,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/realtimebidding1/src/api.rs b/gen/realtimebidding1/src/api.rs index 6f5e426fd4..81c64f27e5 100644 --- a/gen/realtimebidding1/src/api.rs +++ b/gen/realtimebidding1/src/api.rs @@ -2312,25 +2312,15 @@ impl<'a, C> BidderCreativeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2338,13 +2328,15 @@ impl<'a, C> BidderCreativeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2628,25 +2620,15 @@ impl<'a, C> BidderCreativeWatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2654,13 +2636,15 @@ impl<'a, C> BidderCreativeWatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2904,25 +2888,15 @@ impl<'a, C> BidderEndpointGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2930,13 +2904,15 @@ impl<'a, C> BidderEndpointGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3181,25 +3157,15 @@ impl<'a, C> BidderEndpointListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3207,13 +3173,15 @@ impl<'a, C> BidderEndpointListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3483,25 +3451,15 @@ impl<'a, C> BidderPretargetingConfigActivateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3509,13 +3467,15 @@ impl<'a, C> BidderPretargetingConfigActivateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3780,25 +3740,15 @@ impl<'a, C> BidderPretargetingConfigAddTargetedAppCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3806,13 +3756,15 @@ impl<'a, C> BidderPretargetingConfigAddTargetedAppCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4077,25 +4029,15 @@ impl<'a, C> BidderPretargetingConfigAddTargetedPublisherCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4103,13 +4045,15 @@ impl<'a, C> BidderPretargetingConfigAddTargetedPublisherCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4374,25 +4318,15 @@ impl<'a, C> BidderPretargetingConfigAddTargetedSiteCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4400,13 +4334,15 @@ impl<'a, C> BidderPretargetingConfigAddTargetedSiteCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4671,25 +4607,15 @@ impl<'a, C> BidderPretargetingConfigCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4697,13 +4623,15 @@ impl<'a, C> BidderPretargetingConfigCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4947,25 +4875,15 @@ impl<'a, C> BidderPretargetingConfigDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4973,13 +4891,15 @@ impl<'a, C> BidderPretargetingConfigDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5214,25 +5134,15 @@ impl<'a, C> BidderPretargetingConfigGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5240,13 +5150,15 @@ impl<'a, C> BidderPretargetingConfigGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5491,25 +5403,15 @@ impl<'a, C> BidderPretargetingConfigListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5517,13 +5419,15 @@ impl<'a, C> BidderPretargetingConfigListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5798,25 +5702,15 @@ impl<'a, C> BidderPretargetingConfigPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5824,13 +5718,15 @@ impl<'a, C> BidderPretargetingConfigPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6102,25 +5998,15 @@ impl<'a, C> BidderPretargetingConfigRemoveTargetedAppCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6128,13 +6014,15 @@ impl<'a, C> BidderPretargetingConfigRemoveTargetedAppCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6399,25 +6287,15 @@ impl<'a, C> BidderPretargetingConfigRemoveTargetedPublisherCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6425,13 +6303,15 @@ impl<'a, C> BidderPretargetingConfigRemoveTargetedPublisherCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6696,25 +6576,15 @@ impl<'a, C> BidderPretargetingConfigRemoveTargetedSiteCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6722,13 +6592,15 @@ impl<'a, C> BidderPretargetingConfigRemoveTargetedSiteCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6993,25 +6865,15 @@ impl<'a, C> BidderPretargetingConfigSuspendCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7019,13 +6881,15 @@ impl<'a, C> BidderPretargetingConfigSuspendCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7269,25 +7133,15 @@ impl<'a, C> BidderGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7295,13 +7149,15 @@ impl<'a, C> BidderGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7519,25 +7375,15 @@ impl<'a, C> BidderListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7545,13 +7391,15 @@ impl<'a, C> BidderListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7811,25 +7659,15 @@ impl<'a, C> BuyerCreativeCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7837,13 +7675,15 @@ impl<'a, C> BuyerCreativeCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8092,25 +7932,15 @@ impl<'a, C> BuyerCreativeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8118,13 +7948,15 @@ impl<'a, C> BuyerCreativeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8386,25 +8218,15 @@ impl<'a, C> BuyerCreativeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8412,13 +8234,15 @@ impl<'a, C> BuyerCreativeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8707,25 +8531,15 @@ impl<'a, C> BuyerCreativePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8733,13 +8547,15 @@ impl<'a, C> BuyerCreativePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9011,25 +8827,15 @@ impl<'a, C> BuyerUserListCloseCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9037,13 +8843,15 @@ impl<'a, C> BuyerUserListCloseCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9308,25 +9116,15 @@ impl<'a, C> BuyerUserListCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9334,13 +9132,15 @@ impl<'a, C> BuyerUserListCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9584,25 +9384,15 @@ impl<'a, C> BuyerUserListGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9610,13 +9400,15 @@ impl<'a, C> BuyerUserListGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9851,25 +9643,15 @@ impl<'a, C> BuyerUserListGetRemarketingTagCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9877,13 +9659,15 @@ impl<'a, C> BuyerUserListGetRemarketingTagCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10128,25 +9912,15 @@ impl<'a, C> BuyerUserListListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10154,13 +9928,15 @@ impl<'a, C> BuyerUserListListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10430,25 +10206,15 @@ impl<'a, C> BuyerUserListOpenCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10456,13 +10222,15 @@ impl<'a, C> BuyerUserListOpenCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10727,25 +10495,15 @@ impl<'a, C> BuyerUserListUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10753,13 +10511,15 @@ impl<'a, C> BuyerUserListUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11003,25 +10763,15 @@ impl<'a, C> BuyerGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11029,13 +10779,15 @@ impl<'a, C> BuyerGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11270,25 +11022,15 @@ impl<'a, C> BuyerGetRemarketingTagCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11296,13 +11038,15 @@ impl<'a, C> BuyerGetRemarketingTagCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11520,25 +11264,15 @@ impl<'a, C> BuyerListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11546,13 +11280,15 @@ impl<'a, C> BuyerListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/realtimebidding1/src/client.rs b/gen/realtimebidding1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/realtimebidding1/src/client.rs +++ b/gen/realtimebidding1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/recommendationengine1_beta1-cli/src/main.rs b/gen/recommendationengine1_beta1-cli/src/main.rs index fe58277c8e..1351fdf08f 100644 --- a/gen/recommendationengine1_beta1-cli/src/main.rs +++ b/gen/recommendationengine1_beta1-cli/src/main.rs @@ -367,7 +367,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -584,7 +584,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -890,7 +890,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -952,7 +952,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["uri", "ets", "user-event"].iter().map(|v|*v)); + v.extend(["ets", "uri", "user-event"].iter().map(|v|*v)); v } )); } } @@ -1107,7 +1107,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1442,7 +1442,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1556,7 +1556,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/recommendationengine1_beta1/src/api.rs b/gen/recommendationengine1_beta1/src/api.rs index b657d077f8..beb6ed9f81 100644 --- a/gen/recommendationengine1_beta1/src/api.rs +++ b/gen/recommendationengine1_beta1/src/api.rs @@ -1711,25 +1711,15 @@ impl<'a, C> ProjectLocationCatalogCatalogItemCreateCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1737,13 +1727,15 @@ impl<'a, C> ProjectLocationCatalogCatalogItemCreateCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1987,25 +1979,15 @@ impl<'a, C> ProjectLocationCatalogCatalogItemDeleteCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2013,13 +1995,15 @@ impl<'a, C> ProjectLocationCatalogCatalogItemDeleteCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2254,25 +2238,15 @@ impl<'a, C> ProjectLocationCatalogCatalogItemGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2280,13 +2254,15 @@ impl<'a, C> ProjectLocationCatalogCatalogItemGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2542,25 +2518,15 @@ impl<'a, C> ProjectLocationCatalogCatalogItemImportCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2568,13 +2534,15 @@ impl<'a, C> ProjectLocationCatalogCatalogItemImportCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2833,25 +2801,15 @@ impl<'a, C> ProjectLocationCatalogCatalogItemListCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2859,13 +2817,15 @@ impl<'a, C> ProjectLocationCatalogCatalogItemListCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3147,25 +3107,15 @@ impl<'a, C> ProjectLocationCatalogCatalogItemPatchCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3173,13 +3123,15 @@ impl<'a, C> ProjectLocationCatalogCatalogItemPatchCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3430,25 +3382,15 @@ impl<'a, C> ProjectLocationCatalogEventStoreOperationGetCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3456,13 +3398,15 @@ impl<'a, C> ProjectLocationCatalogEventStoreOperationGetCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3712,25 +3656,15 @@ impl<'a, C> ProjectLocationCatalogEventStoreOperationListCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3738,13 +3672,15 @@ impl<'a, C> ProjectLocationCatalogEventStoreOperationListCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4021,25 +3957,15 @@ impl<'a, C> ProjectLocationCatalogEventStorePlacementPredictCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4047,13 +3973,15 @@ impl<'a, C> ProjectLocationCatalogEventStorePlacementPredictCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4318,25 +4246,15 @@ impl<'a, C> ProjectLocationCatalogEventStorePredictionApiKeyRegistrationCreateCa return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4344,13 +4262,15 @@ impl<'a, C> ProjectLocationCatalogEventStorePredictionApiKeyRegistrationCreateCa } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4594,25 +4514,15 @@ impl<'a, C> ProjectLocationCatalogEventStorePredictionApiKeyRegistrationDeleteCa return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4620,13 +4530,15 @@ impl<'a, C> ProjectLocationCatalogEventStorePredictionApiKeyRegistrationDeleteCa } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4871,25 +4783,15 @@ impl<'a, C> ProjectLocationCatalogEventStorePredictionApiKeyRegistrationListCall return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4897,13 +4799,15 @@ impl<'a, C> ProjectLocationCatalogEventStorePredictionApiKeyRegistrationListCall } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5167,25 +5071,15 @@ impl<'a, C> ProjectLocationCatalogEventStoreUserEventCollectCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5193,13 +5087,15 @@ impl<'a, C> ProjectLocationCatalogEventStoreUserEventCollectCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5476,25 +5372,15 @@ impl<'a, C> ProjectLocationCatalogEventStoreUserEventImportCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5502,13 +5388,15 @@ impl<'a, C> ProjectLocationCatalogEventStoreUserEventImportCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5767,25 +5655,15 @@ impl<'a, C> ProjectLocationCatalogEventStoreUserEventListCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5793,13 +5671,15 @@ impl<'a, C> ProjectLocationCatalogEventStoreUserEventListCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6076,25 +5956,15 @@ impl<'a, C> ProjectLocationCatalogEventStoreUserEventPurgeCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6102,13 +5972,15 @@ impl<'a, C> ProjectLocationCatalogEventStoreUserEventPurgeCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6373,25 +6245,15 @@ impl<'a, C> ProjectLocationCatalogEventStoreUserEventRejoinCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6399,13 +6261,15 @@ impl<'a, C> ProjectLocationCatalogEventStoreUserEventRejoinCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6670,25 +6534,15 @@ impl<'a, C> ProjectLocationCatalogEventStoreUserEventWriteCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6696,13 +6550,15 @@ impl<'a, C> ProjectLocationCatalogEventStoreUserEventWriteCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6946,25 +6802,15 @@ impl<'a, C> ProjectLocationCatalogOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6972,13 +6818,15 @@ impl<'a, C> ProjectLocationCatalogOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7228,25 +7076,15 @@ impl<'a, C> ProjectLocationCatalogOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7254,13 +7092,15 @@ impl<'a, C> ProjectLocationCatalogOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7526,25 +7366,15 @@ impl<'a, C> ProjectLocationCatalogListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7552,13 +7382,15 @@ impl<'a, C> ProjectLocationCatalogListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7833,25 +7665,15 @@ impl<'a, C> ProjectLocationCatalogPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7859,13 +7681,15 @@ impl<'a, C> ProjectLocationCatalogPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/recommendationengine1_beta1/src/client.rs b/gen/recommendationengine1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/recommendationengine1_beta1/src/client.rs +++ b/gen/recommendationengine1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/recommender1-cli/src/main.rs b/gen/recommender1-cli/src/main.rs index 9a52fed5ed..36fb902af9 100644 --- a/gen/recommender1-cli/src/main.rs +++ b/gen/recommender1-cli/src/main.rs @@ -122,7 +122,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -322,7 +322,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -694,7 +694,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -894,7 +894,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1266,7 +1266,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1466,7 +1466,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1838,7 +1838,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2038,7 +2038,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/recommender1/src/api.rs b/gen/recommender1/src/api.rs index 6625b81fe1..a84a122f26 100644 --- a/gen/recommender1/src/api.rs +++ b/gen/recommender1/src/api.rs @@ -1536,25 +1536,15 @@ impl<'a, C> BillingAccountLocationInsightTypeInsightGetCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1562,13 +1552,15 @@ impl<'a, C> BillingAccountLocationInsightTypeInsightGetCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1818,25 +1810,15 @@ impl<'a, C> BillingAccountLocationInsightTypeInsightListCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1844,13 +1826,15 @@ impl<'a, C> BillingAccountLocationInsightTypeInsightListCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2127,25 +2111,15 @@ impl<'a, C> BillingAccountLocationInsightTypeInsightMarkAcceptedCall<'a, C> wher return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2153,13 +2127,15 @@ impl<'a, C> BillingAccountLocationInsightTypeInsightMarkAcceptedCall<'a, C> wher } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2403,25 +2379,15 @@ impl<'a, C> BillingAccountLocationRecommenderRecommendationGetCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2429,13 +2395,15 @@ impl<'a, C> BillingAccountLocationRecommenderRecommendationGetCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2685,25 +2653,15 @@ impl<'a, C> BillingAccountLocationRecommenderRecommendationListCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2711,13 +2669,15 @@ impl<'a, C> BillingAccountLocationRecommenderRecommendationListCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2994,25 +2954,15 @@ impl<'a, C> BillingAccountLocationRecommenderRecommendationMarkClaimedCall<'a, C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3020,13 +2970,15 @@ impl<'a, C> BillingAccountLocationRecommenderRecommendationMarkClaimedCall<'a, C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3291,25 +3243,15 @@ impl<'a, C> BillingAccountLocationRecommenderRecommendationMarkFailedCall<'a, C> return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3317,13 +3259,15 @@ impl<'a, C> BillingAccountLocationRecommenderRecommendationMarkFailedCall<'a, C> } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3588,25 +3532,15 @@ impl<'a, C> BillingAccountLocationRecommenderRecommendationMarkSucceededCall<'a, return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3614,13 +3548,15 @@ impl<'a, C> BillingAccountLocationRecommenderRecommendationMarkSucceededCall<'a, } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3864,25 +3800,15 @@ impl<'a, C> FolderLocationInsightTypeInsightGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3890,13 +3816,15 @@ impl<'a, C> FolderLocationInsightTypeInsightGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4146,25 +4074,15 @@ impl<'a, C> FolderLocationInsightTypeInsightListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4172,13 +4090,15 @@ impl<'a, C> FolderLocationInsightTypeInsightListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4455,25 +4375,15 @@ impl<'a, C> FolderLocationInsightTypeInsightMarkAcceptedCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4481,13 +4391,15 @@ impl<'a, C> FolderLocationInsightTypeInsightMarkAcceptedCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4731,25 +4643,15 @@ impl<'a, C> FolderLocationRecommenderRecommendationGetCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4757,13 +4659,15 @@ impl<'a, C> FolderLocationRecommenderRecommendationGetCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5013,25 +4917,15 @@ impl<'a, C> FolderLocationRecommenderRecommendationListCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5039,13 +4933,15 @@ impl<'a, C> FolderLocationRecommenderRecommendationListCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5322,25 +5218,15 @@ impl<'a, C> FolderLocationRecommenderRecommendationMarkClaimedCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5348,13 +5234,15 @@ impl<'a, C> FolderLocationRecommenderRecommendationMarkClaimedCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5619,25 +5507,15 @@ impl<'a, C> FolderLocationRecommenderRecommendationMarkFailedCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5645,13 +5523,15 @@ impl<'a, C> FolderLocationRecommenderRecommendationMarkFailedCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5916,25 +5796,15 @@ impl<'a, C> FolderLocationRecommenderRecommendationMarkSucceededCall<'a, C> wher return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5942,13 +5812,15 @@ impl<'a, C> FolderLocationRecommenderRecommendationMarkSucceededCall<'a, C> wher } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6192,25 +6064,15 @@ impl<'a, C> OrganizationLocationInsightTypeInsightGetCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6218,13 +6080,15 @@ impl<'a, C> OrganizationLocationInsightTypeInsightGetCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6474,25 +6338,15 @@ impl<'a, C> OrganizationLocationInsightTypeInsightListCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6500,13 +6354,15 @@ impl<'a, C> OrganizationLocationInsightTypeInsightListCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6783,25 +6639,15 @@ impl<'a, C> OrganizationLocationInsightTypeInsightMarkAcceptedCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6809,13 +6655,15 @@ impl<'a, C> OrganizationLocationInsightTypeInsightMarkAcceptedCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7059,25 +6907,15 @@ impl<'a, C> OrganizationLocationRecommenderRecommendationGetCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7085,13 +6923,15 @@ impl<'a, C> OrganizationLocationRecommenderRecommendationGetCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7341,25 +7181,15 @@ impl<'a, C> OrganizationLocationRecommenderRecommendationListCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7367,13 +7197,15 @@ impl<'a, C> OrganizationLocationRecommenderRecommendationListCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7650,25 +7482,15 @@ impl<'a, C> OrganizationLocationRecommenderRecommendationMarkClaimedCall<'a, C> return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7676,13 +7498,15 @@ impl<'a, C> OrganizationLocationRecommenderRecommendationMarkClaimedCall<'a, C> } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7947,25 +7771,15 @@ impl<'a, C> OrganizationLocationRecommenderRecommendationMarkFailedCall<'a, C> w return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7973,13 +7787,15 @@ impl<'a, C> OrganizationLocationRecommenderRecommendationMarkFailedCall<'a, C> w } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8244,25 +8060,15 @@ impl<'a, C> OrganizationLocationRecommenderRecommendationMarkSucceededCall<'a, C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8270,13 +8076,15 @@ impl<'a, C> OrganizationLocationRecommenderRecommendationMarkSucceededCall<'a, C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8520,25 +8328,15 @@ impl<'a, C> ProjectLocationInsightTypeInsightGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8546,13 +8344,15 @@ impl<'a, C> ProjectLocationInsightTypeInsightGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8802,25 +8602,15 @@ impl<'a, C> ProjectLocationInsightTypeInsightListCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8828,13 +8618,15 @@ impl<'a, C> ProjectLocationInsightTypeInsightListCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9111,25 +8903,15 @@ impl<'a, C> ProjectLocationInsightTypeInsightMarkAcceptedCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9137,13 +8919,15 @@ impl<'a, C> ProjectLocationInsightTypeInsightMarkAcceptedCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9387,25 +9171,15 @@ impl<'a, C> ProjectLocationRecommenderRecommendationGetCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9413,13 +9187,15 @@ impl<'a, C> ProjectLocationRecommenderRecommendationGetCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9669,25 +9445,15 @@ impl<'a, C> ProjectLocationRecommenderRecommendationListCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9695,13 +9461,15 @@ impl<'a, C> ProjectLocationRecommenderRecommendationListCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9978,25 +9746,15 @@ impl<'a, C> ProjectLocationRecommenderRecommendationMarkClaimedCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10004,13 +9762,15 @@ impl<'a, C> ProjectLocationRecommenderRecommendationMarkClaimedCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10275,25 +10035,15 @@ impl<'a, C> ProjectLocationRecommenderRecommendationMarkFailedCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10301,13 +10051,15 @@ impl<'a, C> ProjectLocationRecommenderRecommendationMarkFailedCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10572,25 +10324,15 @@ impl<'a, C> ProjectLocationRecommenderRecommendationMarkSucceededCall<'a, C> whe return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10598,13 +10340,15 @@ impl<'a, C> ProjectLocationRecommenderRecommendationMarkSucceededCall<'a, C> whe } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/recommender1/src/client.rs b/gen/recommender1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/recommender1/src/client.rs +++ b/gen/recommender1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/recommender1_beta1-cli/src/main.rs b/gen/recommender1_beta1-cli/src/main.rs index 4206a32e28..f0985c2dbf 100644 --- a/gen/recommender1_beta1-cli/src/main.rs +++ b/gen/recommender1_beta1-cli/src/main.rs @@ -122,7 +122,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -322,7 +322,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -694,7 +694,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -894,7 +894,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1266,7 +1266,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1466,7 +1466,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1838,7 +1838,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2038,7 +2038,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/recommender1_beta1/src/api.rs b/gen/recommender1_beta1/src/api.rs index 7ebcb1a62c..d72d2b9bcb 100644 --- a/gen/recommender1_beta1/src/api.rs +++ b/gen/recommender1_beta1/src/api.rs @@ -1536,25 +1536,15 @@ impl<'a, C> BillingAccountLocationInsightTypeInsightGetCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1562,13 +1552,15 @@ impl<'a, C> BillingAccountLocationInsightTypeInsightGetCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1818,25 +1810,15 @@ impl<'a, C> BillingAccountLocationInsightTypeInsightListCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1844,13 +1826,15 @@ impl<'a, C> BillingAccountLocationInsightTypeInsightListCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2127,25 +2111,15 @@ impl<'a, C> BillingAccountLocationInsightTypeInsightMarkAcceptedCall<'a, C> wher return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2153,13 +2127,15 @@ impl<'a, C> BillingAccountLocationInsightTypeInsightMarkAcceptedCall<'a, C> wher } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2403,25 +2379,15 @@ impl<'a, C> BillingAccountLocationRecommenderRecommendationGetCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2429,13 +2395,15 @@ impl<'a, C> BillingAccountLocationRecommenderRecommendationGetCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2685,25 +2653,15 @@ impl<'a, C> BillingAccountLocationRecommenderRecommendationListCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2711,13 +2669,15 @@ impl<'a, C> BillingAccountLocationRecommenderRecommendationListCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2994,25 +2954,15 @@ impl<'a, C> BillingAccountLocationRecommenderRecommendationMarkClaimedCall<'a, C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3020,13 +2970,15 @@ impl<'a, C> BillingAccountLocationRecommenderRecommendationMarkClaimedCall<'a, C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3291,25 +3243,15 @@ impl<'a, C> BillingAccountLocationRecommenderRecommendationMarkFailedCall<'a, C> return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3317,13 +3259,15 @@ impl<'a, C> BillingAccountLocationRecommenderRecommendationMarkFailedCall<'a, C> } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3588,25 +3532,15 @@ impl<'a, C> BillingAccountLocationRecommenderRecommendationMarkSucceededCall<'a, return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3614,13 +3548,15 @@ impl<'a, C> BillingAccountLocationRecommenderRecommendationMarkSucceededCall<'a, } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3864,25 +3800,15 @@ impl<'a, C> FolderLocationInsightTypeInsightGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3890,13 +3816,15 @@ impl<'a, C> FolderLocationInsightTypeInsightGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4146,25 +4074,15 @@ impl<'a, C> FolderLocationInsightTypeInsightListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4172,13 +4090,15 @@ impl<'a, C> FolderLocationInsightTypeInsightListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4455,25 +4375,15 @@ impl<'a, C> FolderLocationInsightTypeInsightMarkAcceptedCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4481,13 +4391,15 @@ impl<'a, C> FolderLocationInsightTypeInsightMarkAcceptedCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4731,25 +4643,15 @@ impl<'a, C> FolderLocationRecommenderRecommendationGetCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4757,13 +4659,15 @@ impl<'a, C> FolderLocationRecommenderRecommendationGetCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5013,25 +4917,15 @@ impl<'a, C> FolderLocationRecommenderRecommendationListCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5039,13 +4933,15 @@ impl<'a, C> FolderLocationRecommenderRecommendationListCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5322,25 +5218,15 @@ impl<'a, C> FolderLocationRecommenderRecommendationMarkClaimedCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5348,13 +5234,15 @@ impl<'a, C> FolderLocationRecommenderRecommendationMarkClaimedCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5619,25 +5507,15 @@ impl<'a, C> FolderLocationRecommenderRecommendationMarkFailedCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5645,13 +5523,15 @@ impl<'a, C> FolderLocationRecommenderRecommendationMarkFailedCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5916,25 +5796,15 @@ impl<'a, C> FolderLocationRecommenderRecommendationMarkSucceededCall<'a, C> wher return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5942,13 +5812,15 @@ impl<'a, C> FolderLocationRecommenderRecommendationMarkSucceededCall<'a, C> wher } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6192,25 +6064,15 @@ impl<'a, C> OrganizationLocationInsightTypeInsightGetCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6218,13 +6080,15 @@ impl<'a, C> OrganizationLocationInsightTypeInsightGetCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6474,25 +6338,15 @@ impl<'a, C> OrganizationLocationInsightTypeInsightListCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6500,13 +6354,15 @@ impl<'a, C> OrganizationLocationInsightTypeInsightListCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6783,25 +6639,15 @@ impl<'a, C> OrganizationLocationInsightTypeInsightMarkAcceptedCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6809,13 +6655,15 @@ impl<'a, C> OrganizationLocationInsightTypeInsightMarkAcceptedCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7059,25 +6907,15 @@ impl<'a, C> OrganizationLocationRecommenderRecommendationGetCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7085,13 +6923,15 @@ impl<'a, C> OrganizationLocationRecommenderRecommendationGetCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7341,25 +7181,15 @@ impl<'a, C> OrganizationLocationRecommenderRecommendationListCall<'a, C> where C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7367,13 +7197,15 @@ impl<'a, C> OrganizationLocationRecommenderRecommendationListCall<'a, C> where C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7650,25 +7482,15 @@ impl<'a, C> OrganizationLocationRecommenderRecommendationMarkClaimedCall<'a, C> return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7676,13 +7498,15 @@ impl<'a, C> OrganizationLocationRecommenderRecommendationMarkClaimedCall<'a, C> } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7947,25 +7771,15 @@ impl<'a, C> OrganizationLocationRecommenderRecommendationMarkFailedCall<'a, C> w return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7973,13 +7787,15 @@ impl<'a, C> OrganizationLocationRecommenderRecommendationMarkFailedCall<'a, C> w } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8244,25 +8060,15 @@ impl<'a, C> OrganizationLocationRecommenderRecommendationMarkSucceededCall<'a, C return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8270,13 +8076,15 @@ impl<'a, C> OrganizationLocationRecommenderRecommendationMarkSucceededCall<'a, C } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8520,25 +8328,15 @@ impl<'a, C> ProjectLocationInsightTypeInsightGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8546,13 +8344,15 @@ impl<'a, C> ProjectLocationInsightTypeInsightGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8802,25 +8602,15 @@ impl<'a, C> ProjectLocationInsightTypeInsightListCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8828,13 +8618,15 @@ impl<'a, C> ProjectLocationInsightTypeInsightListCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9111,25 +8903,15 @@ impl<'a, C> ProjectLocationInsightTypeInsightMarkAcceptedCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9137,13 +8919,15 @@ impl<'a, C> ProjectLocationInsightTypeInsightMarkAcceptedCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9387,25 +9171,15 @@ impl<'a, C> ProjectLocationRecommenderRecommendationGetCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9413,13 +9187,15 @@ impl<'a, C> ProjectLocationRecommenderRecommendationGetCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9669,25 +9445,15 @@ impl<'a, C> ProjectLocationRecommenderRecommendationListCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9695,13 +9461,15 @@ impl<'a, C> ProjectLocationRecommenderRecommendationListCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9978,25 +9746,15 @@ impl<'a, C> ProjectLocationRecommenderRecommendationMarkClaimedCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10004,13 +9762,15 @@ impl<'a, C> ProjectLocationRecommenderRecommendationMarkClaimedCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10275,25 +10035,15 @@ impl<'a, C> ProjectLocationRecommenderRecommendationMarkFailedCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10301,13 +10051,15 @@ impl<'a, C> ProjectLocationRecommenderRecommendationMarkFailedCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10572,25 +10324,15 @@ impl<'a, C> ProjectLocationRecommenderRecommendationMarkSucceededCall<'a, C> whe return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10598,13 +10340,15 @@ impl<'a, C> ProjectLocationRecommenderRecommendationMarkSucceededCall<'a, C> whe } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/recommender1_beta1/src/client.rs b/gen/recommender1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/recommender1_beta1/src/client.rs +++ b/gen/recommender1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/redis1-cli/src/main.rs b/gen/redis1-cli/src/main.rs index 073604bf5a..aa15cf9947 100644 --- a/gen/redis1-cli/src/main.rs +++ b/gen/redis1-cli/src/main.rs @@ -639,7 +639,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -895,7 +895,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1113,7 +1113,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/redis1/src/api.rs b/gen/redis1/src/api.rs index b7838c8a9d..17b00c6015 100644 --- a/gen/redis1/src/api.rs +++ b/gen/redis1/src/api.rs @@ -1094,25 +1094,15 @@ impl<'a, C> ProjectLocationInstanceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1120,13 +1110,15 @@ impl<'a, C> ProjectLocationInstanceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1377,25 +1369,15 @@ impl<'a, C> ProjectLocationInstanceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1403,13 +1385,15 @@ impl<'a, C> ProjectLocationInstanceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1665,25 +1649,15 @@ impl<'a, C> ProjectLocationInstanceExportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1691,13 +1665,15 @@ impl<'a, C> ProjectLocationInstanceExportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1962,25 +1938,15 @@ impl<'a, C> ProjectLocationInstanceFailoverCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1988,13 +1954,15 @@ impl<'a, C> ProjectLocationInstanceFailoverCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2238,25 +2206,15 @@ impl<'a, C> ProjectLocationInstanceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2264,13 +2222,15 @@ impl<'a, C> ProjectLocationInstanceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2505,25 +2465,15 @@ impl<'a, C> ProjectLocationInstanceGetAuthStringCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2531,13 +2481,15 @@ impl<'a, C> ProjectLocationInstanceGetAuthStringCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2793,25 +2745,15 @@ impl<'a, C> ProjectLocationInstanceImportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2819,13 +2761,15 @@ impl<'a, C> ProjectLocationInstanceImportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3079,25 +3023,15 @@ impl<'a, C> ProjectLocationInstanceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3105,13 +3039,15 @@ impl<'a, C> ProjectLocationInstanceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3386,25 +3322,15 @@ impl<'a, C> ProjectLocationInstancePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3412,13 +3338,15 @@ impl<'a, C> ProjectLocationInstancePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3690,25 +3618,15 @@ impl<'a, C> ProjectLocationInstanceUpgradeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3716,13 +3634,15 @@ impl<'a, C> ProjectLocationInstanceUpgradeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3966,25 +3886,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3992,13 +3902,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4233,25 +4145,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4259,13 +4161,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4500,25 +4404,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4526,13 +4420,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4782,25 +4678,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4808,13 +4694,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5070,25 +4958,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5096,13 +4974,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5352,25 +5232,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5378,13 +5248,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/redis1/src/client.rs b/gen/redis1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/redis1/src/client.rs +++ b/gen/redis1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/remotebuildexecution2-cli/src/main.rs b/gen/remotebuildexecution2-cli/src/main.rs index 7f76daf44d..79502fcaac 100644 --- a/gen/remotebuildexecution2-cli/src/main.rs +++ b/gen/remotebuildexecution2-cli/src/main.rs @@ -70,7 +70,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["inline-stdout", "inline-output-files", "inline-stderr"].iter().map(|v|*v)); + v.extend(["inline-output-files", "inline-stderr", "inline-stdout"].iter().map(|v|*v)); v } )); } } diff --git a/gen/remotebuildexecution2/src/api.rs b/gen/remotebuildexecution2/src/api.rs index cee77a4ab9..b2965d8d39 100644 --- a/gen/remotebuildexecution2/src/api.rs +++ b/gen/remotebuildexecution2/src/api.rs @@ -1457,25 +1457,15 @@ impl<'a, C> ActionResultGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1483,13 +1473,15 @@ impl<'a, C> ActionResultGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1796,25 +1788,15 @@ impl<'a, C> ActionResultUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1822,13 +1804,15 @@ impl<'a, C> ActionResultUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2120,25 +2104,15 @@ impl<'a, C> ActionExecuteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2146,13 +2120,15 @@ impl<'a, C> ActionExecuteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2417,25 +2393,15 @@ impl<'a, C> BlobBatchReadCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2443,13 +2409,15 @@ impl<'a, C> BlobBatchReadCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2714,25 +2682,15 @@ impl<'a, C> BlobBatchUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2740,13 +2698,15 @@ impl<'a, C> BlobBatchUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3011,25 +2971,15 @@ impl<'a, C> BlobFindMissingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3037,13 +2987,15 @@ impl<'a, C> BlobFindMissingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3301,25 +3253,15 @@ impl<'a, C> BlobGetTreeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3327,13 +3269,15 @@ impl<'a, C> BlobGetTreeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3623,25 +3567,15 @@ impl<'a, C> OperationWaitExecutionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3649,13 +3583,15 @@ impl<'a, C> OperationWaitExecutionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3899,25 +3835,15 @@ impl<'a, C> MethodGetCapabilityCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3925,13 +3851,15 @@ impl<'a, C> MethodGetCapabilityCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/remotebuildexecution2/src/client.rs b/gen/remotebuildexecution2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/remotebuildexecution2/src/client.rs +++ b/gen/remotebuildexecution2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/replicapool1_beta2-cli/src/main.rs b/gen/replicapool1_beta2-cli/src/main.rs index 7fba2aedad..179d7e1c52 100644 --- a/gen/replicapool1_beta2-cli/src/main.rs +++ b/gen/replicapool1_beta2-cli/src/main.rs @@ -442,7 +442,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "page-token", "max-results"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -865,7 +865,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "page-token", "max-results"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/replicapool1_beta2/src/api.rs b/gen/replicapool1_beta2/src/api.rs index a9fe0c4c4c..ecc9018502 100644 --- a/gen/replicapool1_beta2/src/api.rs +++ b/gen/replicapool1_beta2/src/api.rs @@ -1085,25 +1085,15 @@ impl<'a, C> InstanceGroupManagerAbandonInstanceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1111,13 +1101,15 @@ impl<'a, C> InstanceGroupManagerAbandonInstanceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1377,25 +1369,15 @@ impl<'a, C> InstanceGroupManagerDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1403,13 +1385,15 @@ impl<'a, C> InstanceGroupManagerDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1681,25 +1665,15 @@ impl<'a, C> InstanceGroupManagerDeleteInstanceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1707,13 +1681,15 @@ impl<'a, C> InstanceGroupManagerDeleteInstanceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1973,25 +1949,15 @@ impl<'a, C> InstanceGroupManagerGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1999,13 +1965,15 @@ impl<'a, C> InstanceGroupManagerGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2277,25 +2245,15 @@ impl<'a, C> InstanceGroupManagerInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2303,13 +2261,15 @@ impl<'a, C> InstanceGroupManagerInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2582,25 +2542,15 @@ impl<'a, C> InstanceGroupManagerListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2608,13 +2558,15 @@ impl<'a, C> InstanceGroupManagerListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2897,25 +2849,15 @@ impl<'a, C> InstanceGroupManagerRecreateInstanceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2923,13 +2865,15 @@ impl<'a, C> InstanceGroupManagerRecreateInstanceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3191,25 +3135,15 @@ impl<'a, C> InstanceGroupManagerResizeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3217,13 +3151,15 @@ impl<'a, C> InstanceGroupManagerResizeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3505,25 +3441,15 @@ impl<'a, C> InstanceGroupManagerSetInstanceTemplateCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3531,13 +3457,15 @@ impl<'a, C> InstanceGroupManagerSetInstanceTemplateCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3818,25 +3746,15 @@ impl<'a, C> InstanceGroupManagerSetTargetPoolCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3844,13 +3762,15 @@ impl<'a, C> InstanceGroupManagerSetTargetPoolCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4110,25 +4030,15 @@ impl<'a, C> ZoneOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4136,13 +4046,15 @@ impl<'a, C> ZoneOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4406,25 +4318,15 @@ impl<'a, C> ZoneOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4432,13 +4334,15 @@ impl<'a, C> ZoneOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/replicapool1_beta2/src/client.rs b/gen/replicapool1_beta2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/replicapool1_beta2/src/client.rs +++ b/gen/replicapool1_beta2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/replicapoolupdater1_beta1-cli/src/main.rs b/gen/replicapoolupdater1_beta1-cli/src/main.rs index 0b2d512cbc..76203c4989 100644 --- a/gen/replicapoolupdater1_beta1-cli/src/main.rs +++ b/gen/replicapoolupdater1_beta1-cli/src/main.rs @@ -277,7 +277,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -339,7 +339,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -609,7 +609,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/replicapoolupdater1_beta1/src/api.rs b/gen/replicapoolupdater1_beta1/src/api.rs index 0b8bec677f..ff716a7078 100644 --- a/gen/replicapoolupdater1_beta1/src/api.rs +++ b/gen/replicapoolupdater1_beta1/src/api.rs @@ -1040,25 +1040,15 @@ impl<'a, C> RollingUpdateCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1066,13 +1056,15 @@ impl<'a, C> RollingUpdateCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1323,25 +1315,15 @@ impl<'a, C> RollingUpdateGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1349,13 +1331,15 @@ impl<'a, C> RollingUpdateGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1625,25 +1609,15 @@ impl<'a, C> RollingUpdateInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1651,13 +1625,15 @@ impl<'a, C> RollingUpdateInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1920,25 +1896,15 @@ impl<'a, C> RollingUpdateListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1946,13 +1912,15 @@ impl<'a, C> RollingUpdateListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2229,25 +2197,15 @@ impl<'a, C> RollingUpdateListInstanceUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2255,13 +2213,15 @@ impl<'a, C> RollingUpdateListInstanceUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2533,25 +2493,15 @@ impl<'a, C> RollingUpdatePauseCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2559,13 +2509,15 @@ impl<'a, C> RollingUpdatePauseCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2816,25 +2768,15 @@ impl<'a, C> RollingUpdateResumeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2842,13 +2784,15 @@ impl<'a, C> RollingUpdateResumeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3099,25 +3043,15 @@ impl<'a, C> RollingUpdateRollbackCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3125,13 +3059,15 @@ impl<'a, C> RollingUpdateRollbackCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3382,25 +3318,15 @@ impl<'a, C> ZoneOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3408,13 +3334,15 @@ impl<'a, C> ZoneOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3678,25 +3606,15 @@ impl<'a, C> ZoneOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3704,13 +3622,15 @@ impl<'a, C> ZoneOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/replicapoolupdater1_beta1/src/client.rs b/gen/replicapoolupdater1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/replicapoolupdater1_beta1/src/client.rs +++ b/gen/replicapoolupdater1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/reseller1_sandbox-cli/src/main.rs b/gen/reseller1_sandbox-cli/src/main.rs index 90e0a91732..84f24366c0 100644 --- a/gen/reseller1_sandbox-cli/src/main.rs +++ b/gen/reseller1_sandbox-cli/src/main.rs @@ -963,7 +963,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["customer-name-prefix", "customer-id", "max-results", "page-token", "customer-auth-token"].iter().map(|v|*v)); + v.extend(["customer-auth-token", "customer-id", "customer-name-prefix", "max-results", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/reseller1_sandbox/src/api.rs b/gen/reseller1_sandbox/src/api.rs index 7eb5021749..fc42a08370 100644 --- a/gen/reseller1_sandbox/src/api.rs +++ b/gen/reseller1_sandbox/src/api.rs @@ -1012,25 +1012,15 @@ impl<'a, C> CustomerGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1038,13 +1028,15 @@ impl<'a, C> CustomerGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1274,25 +1266,15 @@ impl<'a, C> CustomerInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1300,13 +1282,15 @@ impl<'a, C> CustomerInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1560,25 +1544,15 @@ impl<'a, C> CustomerPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1586,13 +1560,15 @@ impl<'a, C> CustomerPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1849,25 +1825,15 @@ impl<'a, C> CustomerUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1875,13 +1841,15 @@ impl<'a, C> CustomerUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2119,25 +2087,15 @@ impl<'a, C> SubscriptionActivateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2145,13 +2103,15 @@ impl<'a, C> SubscriptionActivateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2411,25 +2371,15 @@ impl<'a, C> SubscriptionChangePlanCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2437,13 +2387,15 @@ impl<'a, C> SubscriptionChangePlanCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2712,25 +2664,15 @@ impl<'a, C> SubscriptionChangeRenewalSettingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2738,13 +2680,15 @@ impl<'a, C> SubscriptionChangeRenewalSettingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3013,25 +2957,15 @@ impl<'a, C> SubscriptionChangeSeatCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3039,13 +2973,15 @@ impl<'a, C> SubscriptionChangeSeatCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3294,25 +3230,15 @@ impl<'a, C> SubscriptionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3320,11 +3246,11 @@ impl<'a, C> SubscriptionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -3567,25 +3493,15 @@ impl<'a, C> SubscriptionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3593,13 +3509,15 @@ impl<'a, C> SubscriptionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3862,25 +3780,15 @@ impl<'a, C> SubscriptionInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3888,13 +3796,15 @@ impl<'a, C> SubscriptionInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4139,25 +4049,15 @@ impl<'a, C> SubscriptionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4165,13 +4065,15 @@ impl<'a, C> SubscriptionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4425,25 +4327,15 @@ impl<'a, C> SubscriptionStartPaidServiceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4451,13 +4343,15 @@ impl<'a, C> SubscriptionStartPaidServiceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4696,25 +4590,15 @@ impl<'a, C> SubscriptionSuspendCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4722,13 +4606,15 @@ impl<'a, C> SubscriptionSuspendCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/reseller1_sandbox/src/client.rs b/gen/reseller1_sandbox/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/reseller1_sandbox/src/client.rs +++ b/gen/reseller1_sandbox/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/resourceviews1_beta2-cli/src/main.rs b/gen/resourceviews1_beta2-cli/src/main.rs index 58a2b06bc1..d7b20e214c 100644 --- a/gen/resourceviews1_beta2-cli/src/main.rs +++ b/gen/resourceviews1_beta2-cli/src/main.rs @@ -122,7 +122,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -588,7 +588,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "service-name", "format", "page-token", "list-state"].iter().map(|v|*v)); + v.extend(["format", "list-state", "max-results", "page-token", "service-name"].iter().map(|v|*v)); v } )); } } diff --git a/gen/resourceviews1_beta2/src/api.rs b/gen/resourceviews1_beta2/src/api.rs index 7e6fce1a5e..ab62042362 100644 --- a/gen/resourceviews1_beta2/src/api.rs +++ b/gen/resourceviews1_beta2/src/api.rs @@ -1059,25 +1059,15 @@ impl<'a, C> ZoneOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1085,13 +1075,15 @@ impl<'a, C> ZoneOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1355,25 +1347,15 @@ impl<'a, C> ZoneOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1381,13 +1363,15 @@ impl<'a, C> ZoneOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1670,25 +1654,15 @@ impl<'a, C> ZoneViewAddResourceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1696,13 +1670,15 @@ impl<'a, C> ZoneViewAddResourceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1962,25 +1938,15 @@ impl<'a, C> ZoneViewDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1988,13 +1954,15 @@ impl<'a, C> ZoneViewDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2245,25 +2213,15 @@ impl<'a, C> ZoneViewGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2271,13 +2229,15 @@ impl<'a, C> ZoneViewGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2533,25 +2493,15 @@ impl<'a, C> ZoneViewGetServiceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2559,13 +2509,15 @@ impl<'a, C> ZoneViewGetServiceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2842,25 +2794,15 @@ impl<'a, C> ZoneViewInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2868,13 +2810,15 @@ impl<'a, C> ZoneViewInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3132,25 +3076,15 @@ impl<'a, C> ZoneViewListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3158,13 +3092,15 @@ impl<'a, C> ZoneViewListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3444,25 +3380,15 @@ impl<'a, C> ZoneViewListResourceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3470,13 +3396,15 @@ impl<'a, C> ZoneViewListResourceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3783,25 +3711,15 @@ impl<'a, C> ZoneViewRemoveResourceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3809,13 +3727,15 @@ impl<'a, C> ZoneViewRemoveResourceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4096,25 +4016,15 @@ impl<'a, C> ZoneViewSetServiceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4122,13 +4032,15 @@ impl<'a, C> ZoneViewSetServiceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/resourceviews1_beta2/src/client.rs b/gen/resourceviews1_beta2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/resourceviews1_beta2/src/client.rs +++ b/gen/resourceviews1_beta2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/retail2-cli/src/main.rs b/gen/retail2-cli/src/main.rs index 6afa13eb77..b5d89fa3eb 100644 --- a/gen/retail2-cli/src/main.rs +++ b/gen/retail2-cli/src/main.rs @@ -527,7 +527,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -641,7 +641,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -904,7 +904,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["ets", "user-event", "uri"].iter().map(|v|*v)); + v.extend(["ets", "uri", "user-event"].iter().map(|v|*v)); v } )); } } @@ -1385,7 +1385,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/retail2/src/api.rs b/gen/retail2/src/api.rs index 6906d592e9..87e71a4477 100644 --- a/gen/retail2/src/api.rs +++ b/gen/retail2/src/api.rs @@ -1385,25 +1385,15 @@ impl<'a, C> ProjectLocationCatalogBrancheOperationGetCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1411,13 +1401,15 @@ impl<'a, C> ProjectLocationCatalogBrancheOperationGetCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1678,25 +1670,15 @@ impl<'a, C> ProjectLocationCatalogBrancheProductCreateCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1704,13 +1686,15 @@ impl<'a, C> ProjectLocationCatalogBrancheProductCreateCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1961,25 +1945,15 @@ impl<'a, C> ProjectLocationCatalogBrancheProductDeleteCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1987,13 +1961,15 @@ impl<'a, C> ProjectLocationCatalogBrancheProductDeleteCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2228,25 +2204,15 @@ impl<'a, C> ProjectLocationCatalogBrancheProductGetCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2254,13 +2220,15 @@ impl<'a, C> ProjectLocationCatalogBrancheProductGetCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2516,25 +2484,15 @@ impl<'a, C> ProjectLocationCatalogBrancheProductImportCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2542,13 +2500,15 @@ impl<'a, C> ProjectLocationCatalogBrancheProductImportCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2823,25 +2783,15 @@ impl<'a, C> ProjectLocationCatalogBrancheProductPatchCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2849,13 +2799,15 @@ impl<'a, C> ProjectLocationCatalogBrancheProductPatchCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3113,25 +3065,15 @@ impl<'a, C> ProjectLocationCatalogOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3139,13 +3081,15 @@ impl<'a, C> ProjectLocationCatalogOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3395,25 +3339,15 @@ impl<'a, C> ProjectLocationCatalogOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3421,13 +3355,15 @@ impl<'a, C> ProjectLocationCatalogOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3704,25 +3640,15 @@ impl<'a, C> ProjectLocationCatalogPlacementPredictCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3730,13 +3656,15 @@ impl<'a, C> ProjectLocationCatalogPlacementPredictCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3995,25 +3923,15 @@ impl<'a, C> ProjectLocationCatalogUserEventCollectCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4021,13 +3939,15 @@ impl<'a, C> ProjectLocationCatalogUserEventCollectCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4304,25 +4224,15 @@ impl<'a, C> ProjectLocationCatalogUserEventImportCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4330,13 +4240,15 @@ impl<'a, C> ProjectLocationCatalogUserEventImportCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4601,25 +4513,15 @@ impl<'a, C> ProjectLocationCatalogUserEventPurgeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4627,13 +4529,15 @@ impl<'a, C> ProjectLocationCatalogUserEventPurgeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4898,25 +4802,15 @@ impl<'a, C> ProjectLocationCatalogUserEventRejoinCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4924,13 +4818,15 @@ impl<'a, C> ProjectLocationCatalogUserEventRejoinCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5195,25 +5091,15 @@ impl<'a, C> ProjectLocationCatalogUserEventWriteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5221,13 +5107,15 @@ impl<'a, C> ProjectLocationCatalogUserEventWriteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5481,25 +5369,15 @@ impl<'a, C> ProjectLocationCatalogListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5507,13 +5385,15 @@ impl<'a, C> ProjectLocationCatalogListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5788,25 +5668,15 @@ impl<'a, C> ProjectLocationCatalogPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5814,13 +5684,15 @@ impl<'a, C> ProjectLocationCatalogPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6071,25 +5943,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6097,13 +5959,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6353,25 +6217,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6379,13 +6233,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/retail2/src/client.rs b/gen/retail2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/retail2/src/client.rs +++ b/gen/retail2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/run1-cli/src/main.rs b/gen/run1-cli/src/main.rs index 0c98de47dc..3ac8ee36a4 100644 --- a/gen/run1-cli/src/main.rs +++ b/gen/run1-cli/src/main.rs @@ -193,7 +193,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["continue", "resource-version", "field-selector", "include-uninitialized", "limit", "watch", "label-selector"].iter().map(|v|*v)); + v.extend(["continue", "field-selector", "include-uninitialized", "label-selector", "limit", "resource-version", "watch"].iter().map(|v|*v)); v } )); } } @@ -368,7 +368,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["propagation-policy", "dry-run", "api-version", "kind"].iter().map(|v|*v)); + v.extend(["api-version", "dry-run", "kind", "propagation-policy"].iter().map(|v|*v)); v } )); } } @@ -494,7 +494,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["continue", "resource-version", "field-selector", "include-uninitialized", "limit", "watch", "label-selector"].iter().map(|v|*v)); + v.extend(["continue", "field-selector", "include-uninitialized", "label-selector", "limit", "resource-version", "watch"].iter().map(|v|*v)); v } )); } } @@ -559,7 +559,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["propagation-policy", "dry-run", "api-version", "kind"].iter().map(|v|*v)); + v.extend(["api-version", "dry-run", "kind", "propagation-policy"].iter().map(|v|*v)); v } )); } } @@ -685,7 +685,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["continue", "resource-version", "field-selector", "include-uninitialized", "limit", "watch", "label-selector"].iter().map(|v|*v)); + v.extend(["continue", "field-selector", "include-uninitialized", "label-selector", "limit", "resource-version", "watch"].iter().map(|v|*v)); v } )); } } @@ -811,7 +811,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["continue", "resource-version", "field-selector", "include-uninitialized", "limit", "watch", "label-selector"].iter().map(|v|*v)); + v.extend(["continue", "field-selector", "include-uninitialized", "label-selector", "limit", "resource-version", "watch"].iter().map(|v|*v)); v } )); } } @@ -1002,7 +1002,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["propagation-policy", "dry-run", "api-version", "kind"].iter().map(|v|*v)); + v.extend(["api-version", "dry-run", "kind", "propagation-policy"].iter().map(|v|*v)); v } )); } } @@ -1128,7 +1128,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["continue", "resource-version", "field-selector", "include-uninitialized", "limit", "watch", "label-selector"].iter().map(|v|*v)); + v.extend(["continue", "field-selector", "include-uninitialized", "label-selector", "limit", "resource-version", "watch"].iter().map(|v|*v)); v } )); } } @@ -1498,7 +1498,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["continue", "resource-version", "field-selector", "include-uninitialized", "limit", "watch", "label-selector"].iter().map(|v|*v)); + v.extend(["continue", "field-selector", "include-uninitialized", "label-selector", "limit", "resource-version", "watch"].iter().map(|v|*v)); v } )); } } @@ -1673,7 +1673,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["propagation-policy", "dry-run", "api-version", "kind"].iter().map(|v|*v)); + v.extend(["api-version", "dry-run", "kind", "propagation-policy"].iter().map(|v|*v)); v } )); } } @@ -1799,7 +1799,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["continue", "resource-version", "field-selector", "include-uninitialized", "limit", "watch", "label-selector"].iter().map(|v|*v)); + v.extend(["continue", "field-selector", "include-uninitialized", "label-selector", "limit", "resource-version", "watch"].iter().map(|v|*v)); v } )); } } @@ -1861,7 +1861,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1926,7 +1926,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["propagation-policy", "dry-run", "api-version", "kind"].iter().map(|v|*v)); + v.extend(["api-version", "dry-run", "kind", "propagation-policy"].iter().map(|v|*v)); v } )); } } @@ -2052,7 +2052,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["continue", "resource-version", "field-selector", "include-uninitialized", "limit", "watch", "label-selector"].iter().map(|v|*v)); + v.extend(["continue", "field-selector", "include-uninitialized", "label-selector", "limit", "resource-version", "watch"].iter().map(|v|*v)); v } )); } } @@ -2178,7 +2178,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["continue", "resource-version", "field-selector", "include-uninitialized", "limit", "watch", "label-selector"].iter().map(|v|*v)); + v.extend(["continue", "field-selector", "include-uninitialized", "label-selector", "limit", "resource-version", "watch"].iter().map(|v|*v)); v } )); } } @@ -2369,7 +2369,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["propagation-policy", "dry-run", "api-version", "kind"].iter().map(|v|*v)); + v.extend(["api-version", "dry-run", "kind", "propagation-policy"].iter().map(|v|*v)); v } )); } } @@ -2551,7 +2551,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["continue", "resource-version", "field-selector", "include-uninitialized", "limit", "watch", "label-selector"].iter().map(|v|*v)); + v.extend(["continue", "field-selector", "include-uninitialized", "label-selector", "limit", "resource-version", "watch"].iter().map(|v|*v)); v } )); } } diff --git a/gen/run1/src/api.rs b/gen/run1/src/api.rs index bd58cc4ba0..d36c3aeda7 100644 --- a/gen/run1/src/api.rs +++ b/gen/run1/src/api.rs @@ -2634,25 +2634,15 @@ impl<'a, C> NamespaceAuthorizeddomainListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2660,13 +2650,15 @@ impl<'a, C> NamespaceAuthorizeddomainListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2915,25 +2907,15 @@ impl<'a, C> NamespaceConfigurationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2941,13 +2923,15 @@ impl<'a, C> NamespaceConfigurationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3217,25 +3201,15 @@ impl<'a, C> NamespaceConfigurationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3243,13 +3217,15 @@ impl<'a, C> NamespaceConfigurationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3559,25 +3535,15 @@ impl<'a, C> NamespaceDomainmappingCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3585,13 +3551,15 @@ impl<'a, C> NamespaceDomainmappingCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3862,25 +3830,15 @@ impl<'a, C> NamespaceDomainmappingDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3888,13 +3846,15 @@ impl<'a, C> NamespaceDomainmappingDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4157,25 +4117,15 @@ impl<'a, C> NamespaceDomainmappingGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4183,13 +4133,15 @@ impl<'a, C> NamespaceDomainmappingGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4459,25 +4411,15 @@ impl<'a, C> NamespaceDomainmappingListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4485,13 +4427,15 @@ impl<'a, C> NamespaceDomainmappingListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4795,25 +4739,15 @@ impl<'a, C> NamespaceRevisionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4821,13 +4755,15 @@ impl<'a, C> NamespaceRevisionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5090,25 +5026,15 @@ impl<'a, C> NamespaceRevisionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5116,13 +5042,15 @@ impl<'a, C> NamespaceRevisionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5392,25 +5320,15 @@ impl<'a, C> NamespaceRevisionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5418,13 +5336,15 @@ impl<'a, C> NamespaceRevisionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5708,25 +5628,15 @@ impl<'a, C> NamespaceRouteGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5734,13 +5644,15 @@ impl<'a, C> NamespaceRouteGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6010,25 +5922,15 @@ impl<'a, C> NamespaceRouteListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6036,13 +5938,15 @@ impl<'a, C> NamespaceRouteListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6352,25 +6256,15 @@ impl<'a, C> NamespaceServiceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6378,13 +6272,15 @@ impl<'a, C> NamespaceServiceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6655,25 +6551,15 @@ impl<'a, C> NamespaceServiceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6681,13 +6567,15 @@ impl<'a, C> NamespaceServiceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6950,25 +6838,15 @@ impl<'a, C> NamespaceServiceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6976,13 +6854,15 @@ impl<'a, C> NamespaceServiceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7252,25 +7132,15 @@ impl<'a, C> NamespaceServiceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7278,13 +7148,15 @@ impl<'a, C> NamespaceServiceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7594,25 +7466,15 @@ impl<'a, C> NamespaceServiceReplaceServiceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7620,13 +7482,15 @@ impl<'a, C> NamespaceServiceReplaceServiceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7887,25 +7751,15 @@ impl<'a, C> ProjectAuthorizeddomainListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7913,13 +7767,15 @@ impl<'a, C> ProjectAuthorizeddomainListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8178,25 +8034,15 @@ impl<'a, C> ProjectLocationAuthorizeddomainListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8204,13 +8050,15 @@ impl<'a, C> ProjectLocationAuthorizeddomainListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8459,25 +8307,15 @@ impl<'a, C> ProjectLocationConfigurationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8485,13 +8323,15 @@ impl<'a, C> ProjectLocationConfigurationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8761,25 +8601,15 @@ impl<'a, C> ProjectLocationConfigurationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8787,13 +8617,15 @@ impl<'a, C> ProjectLocationConfigurationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9103,25 +8935,15 @@ impl<'a, C> ProjectLocationDomainmappingCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9129,13 +8951,15 @@ impl<'a, C> ProjectLocationDomainmappingCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9406,25 +9230,15 @@ impl<'a, C> ProjectLocationDomainmappingDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9432,13 +9246,15 @@ impl<'a, C> ProjectLocationDomainmappingDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9701,25 +9517,15 @@ impl<'a, C> ProjectLocationDomainmappingGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9727,13 +9533,15 @@ impl<'a, C> ProjectLocationDomainmappingGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10003,25 +9811,15 @@ impl<'a, C> ProjectLocationDomainmappingListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10029,13 +9827,15 @@ impl<'a, C> ProjectLocationDomainmappingListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10339,25 +10139,15 @@ impl<'a, C> ProjectLocationRevisionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10365,13 +10155,15 @@ impl<'a, C> ProjectLocationRevisionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10634,25 +10426,15 @@ impl<'a, C> ProjectLocationRevisionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10660,13 +10442,15 @@ impl<'a, C> ProjectLocationRevisionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10936,25 +10720,15 @@ impl<'a, C> ProjectLocationRevisionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10962,13 +10736,15 @@ impl<'a, C> ProjectLocationRevisionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11252,25 +11028,15 @@ impl<'a, C> ProjectLocationRouteGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11278,13 +11044,15 @@ impl<'a, C> ProjectLocationRouteGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11554,25 +11322,15 @@ impl<'a, C> ProjectLocationRouteListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11580,13 +11338,15 @@ impl<'a, C> ProjectLocationRouteListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11896,25 +11656,15 @@ impl<'a, C> ProjectLocationServiceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11922,13 +11672,15 @@ impl<'a, C> ProjectLocationServiceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12199,25 +11951,15 @@ impl<'a, C> ProjectLocationServiceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12225,13 +11967,15 @@ impl<'a, C> ProjectLocationServiceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12494,25 +12238,15 @@ impl<'a, C> ProjectLocationServiceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12520,13 +12254,15 @@ impl<'a, C> ProjectLocationServiceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12766,25 +12502,15 @@ impl<'a, C> ProjectLocationServiceGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12792,13 +12518,15 @@ impl<'a, C> ProjectLocationServiceGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13075,25 +12803,15 @@ impl<'a, C> ProjectLocationServiceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13101,13 +12819,15 @@ impl<'a, C> ProjectLocationServiceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13417,25 +13137,15 @@ impl<'a, C> ProjectLocationServiceReplaceServiceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13443,13 +13153,15 @@ impl<'a, C> ProjectLocationServiceReplaceServiceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13721,25 +13433,15 @@ impl<'a, C> ProjectLocationServiceSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13747,13 +13449,15 @@ impl<'a, C> ProjectLocationServiceSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14018,25 +13722,15 @@ impl<'a, C> ProjectLocationServiceTestIamPermissionCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14044,13 +13738,15 @@ impl<'a, C> ProjectLocationServiceTestIamPermissionCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14309,25 +14005,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14335,13 +14021,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/run1/src/client.rs b/gen/run1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/run1/src/client.rs +++ b/gen/run1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/runtimeconfig1-cli/src/main.rs b/gen/runtimeconfig1-cli/src/main.rs index 32192c8b90..1591764e80 100644 --- a/gen/runtimeconfig1-cli/src/main.rs +++ b/gen/runtimeconfig1-cli/src/main.rs @@ -206,7 +206,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/runtimeconfig1/src/api.rs b/gen/runtimeconfig1/src/api.rs index 6221d1283e..e4bbda0ebb 100644 --- a/gen/runtimeconfig1/src/api.rs +++ b/gen/runtimeconfig1/src/api.rs @@ -536,25 +536,15 @@ impl<'a, C> OperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -562,13 +552,15 @@ impl<'a, C> OperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -812,25 +804,15 @@ impl<'a, C> OperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -838,13 +820,15 @@ impl<'a, C> OperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1094,25 +1078,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1120,13 +1094,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/runtimeconfig1/src/client.rs b/gen/runtimeconfig1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/runtimeconfig1/src/client.rs +++ b/gen/runtimeconfig1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/runtimeconfig1_beta1-cli/src/main.rs b/gen/runtimeconfig1_beta1-cli/src/main.rs index 88ab377ec9..5e33ddd1fd 100644 --- a/gen/runtimeconfig1_beta1-cli/src/main.rs +++ b/gen/runtimeconfig1_beta1-cli/src/main.rs @@ -317,7 +317,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -977,7 +977,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "return-values", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token", "return-values"].iter().map(|v|*v)); v } )); } } @@ -1497,7 +1497,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/runtimeconfig1_beta1/src/api.rs b/gen/runtimeconfig1_beta1/src/api.rs index ef5c33d68c..019add5689 100644 --- a/gen/runtimeconfig1_beta1/src/api.rs +++ b/gen/runtimeconfig1_beta1/src/api.rs @@ -1152,25 +1152,15 @@ impl<'a, C> ProjectConfigOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1178,13 +1168,15 @@ impl<'a, C> ProjectConfigOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1440,25 +1432,15 @@ impl<'a, C> ProjectConfigOperationTestIamPermissionCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1466,13 +1448,15 @@ impl<'a, C> ProjectConfigOperationTestIamPermissionCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1742,25 +1726,15 @@ impl<'a, C> ProjectConfigVariableCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1768,13 +1742,15 @@ impl<'a, C> ProjectConfigVariableCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2030,25 +2006,15 @@ impl<'a, C> ProjectConfigVariableDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2056,13 +2022,15 @@ impl<'a, C> ProjectConfigVariableDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2304,25 +2272,15 @@ impl<'a, C> ProjectConfigVariableGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2330,13 +2288,15 @@ impl<'a, C> ProjectConfigVariableGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2591,25 +2551,15 @@ impl<'a, C> ProjectConfigVariableListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2617,13 +2567,15 @@ impl<'a, C> ProjectConfigVariableListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2907,25 +2859,15 @@ impl<'a, C> ProjectConfigVariableTestIamPermissionCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2933,13 +2875,15 @@ impl<'a, C> ProjectConfigVariableTestIamPermissionCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3204,25 +3148,15 @@ impl<'a, C> ProjectConfigVariableUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3230,13 +3164,15 @@ impl<'a, C> ProjectConfigVariableUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3501,25 +3437,15 @@ impl<'a, C> ProjectConfigVariableWatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3527,13 +3453,15 @@ impl<'a, C> ProjectConfigVariableWatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3803,25 +3731,15 @@ impl<'a, C> ProjectConfigWaiterCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3829,13 +3747,15 @@ impl<'a, C> ProjectConfigWaiterCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4086,25 +4006,15 @@ impl<'a, C> ProjectConfigWaiterDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4112,13 +4022,15 @@ impl<'a, C> ProjectConfigWaiterDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4353,25 +4265,15 @@ impl<'a, C> ProjectConfigWaiterGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4379,13 +4281,15 @@ impl<'a, C> ProjectConfigWaiterGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4630,25 +4534,15 @@ impl<'a, C> ProjectConfigWaiterListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4656,13 +4550,15 @@ impl<'a, C> ProjectConfigWaiterListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4932,25 +4828,15 @@ impl<'a, C> ProjectConfigWaiterTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4958,13 +4844,15 @@ impl<'a, C> ProjectConfigWaiterTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5234,25 +5122,15 @@ impl<'a, C> ProjectConfigCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5260,13 +5138,15 @@ impl<'a, C> ProjectConfigCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5517,25 +5397,15 @@ impl<'a, C> ProjectConfigDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5543,13 +5413,15 @@ impl<'a, C> ProjectConfigDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5784,25 +5656,15 @@ impl<'a, C> ProjectConfigGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5810,13 +5672,15 @@ impl<'a, C> ProjectConfigGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6056,25 +5920,15 @@ impl<'a, C> ProjectConfigGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6082,13 +5936,15 @@ impl<'a, C> ProjectConfigGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6340,25 +6196,15 @@ impl<'a, C> ProjectConfigListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6366,13 +6212,15 @@ impl<'a, C> ProjectConfigListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6642,25 +6490,15 @@ impl<'a, C> ProjectConfigSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6668,13 +6506,15 @@ impl<'a, C> ProjectConfigSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6939,25 +6779,15 @@ impl<'a, C> ProjectConfigTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6965,13 +6795,15 @@ impl<'a, C> ProjectConfigTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7236,25 +7068,15 @@ impl<'a, C> ProjectConfigUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7262,13 +7084,15 @@ impl<'a, C> ProjectConfigUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/runtimeconfig1_beta1/src/client.rs b/gen/runtimeconfig1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/runtimeconfig1_beta1/src/client.rs +++ b/gen/runtimeconfig1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/safebrowsing4/src/api.rs b/gen/safebrowsing4/src/api.rs index d624c719de..62a50a385b 100644 --- a/gen/safebrowsing4/src/api.rs +++ b/gen/safebrowsing4/src/api.rs @@ -1267,25 +1267,15 @@ impl<'a, C> EncodedFullHasheGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1293,13 +1283,15 @@ impl<'a, C> EncodedFullHasheGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1523,25 +1515,15 @@ impl<'a, C> EncodedUpdateGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1549,13 +1531,15 @@ impl<'a, C> EncodedUpdateGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1767,25 +1751,15 @@ impl<'a, C> FullHasheFindCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1793,13 +1767,15 @@ impl<'a, C> FullHasheFindCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1996,25 +1972,15 @@ impl<'a, C> ThreatHitCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2022,13 +1988,15 @@ impl<'a, C> ThreatHitCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2225,25 +2193,15 @@ impl<'a, C> ThreatListUpdateFetchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2251,13 +2209,15 @@ impl<'a, C> ThreatListUpdateFetchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2433,25 +2393,15 @@ impl<'a, C> ThreatListListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2459,13 +2409,15 @@ impl<'a, C> ThreatListListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2653,25 +2605,15 @@ impl<'a, C> ThreatMatcheFindCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2679,13 +2621,15 @@ impl<'a, C> ThreatMatcheFindCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/safebrowsing4/src/client.rs b/gen/safebrowsing4/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/safebrowsing4/src/client.rs +++ b/gen/safebrowsing4/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/sasportal1_alpha1-cli/src/main.rs b/gen/sasportal1_alpha1-cli/src/main.rs index 794ce0a303..e861e8a7f2 100644 --- a/gen/sasportal1_alpha1-cli/src/main.rs +++ b/gen/sasportal1_alpha1-cli/src/main.rs @@ -442,7 +442,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -556,7 +556,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1131,7 +1131,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1707,7 +1707,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1997,7 +1997,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2290,7 +2290,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2404,7 +2404,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2638,7 +2638,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3957,7 +3957,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -4071,7 +4071,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -4646,7 +4646,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -5453,7 +5453,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -5746,7 +5746,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -5860,7 +5860,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -6094,7 +6094,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/sasportal1_alpha1/src/api.rs b/gen/sasportal1_alpha1/src/api.rs index 4e631620bd..b835284de3 100644 --- a/gen/sasportal1_alpha1/src/api.rs +++ b/gen/sasportal1_alpha1/src/api.rs @@ -2871,25 +2871,15 @@ impl<'a, C> CustomerDeploymentDeviceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2897,13 +2887,15 @@ impl<'a, C> CustomerDeploymentDeviceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3168,25 +3160,15 @@ impl<'a, C> CustomerDeploymentDeviceCreateSignedCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3194,13 +3176,15 @@ impl<'a, C> CustomerDeploymentDeviceCreateSignedCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3459,25 +3443,15 @@ impl<'a, C> CustomerDeploymentDeviceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3485,13 +3459,15 @@ impl<'a, C> CustomerDeploymentDeviceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3768,25 +3744,15 @@ impl<'a, C> CustomerDeploymentCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3794,13 +3760,15 @@ impl<'a, C> CustomerDeploymentCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4044,25 +4012,15 @@ impl<'a, C> CustomerDeploymentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4070,13 +4028,15 @@ impl<'a, C> CustomerDeploymentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4311,25 +4271,15 @@ impl<'a, C> CustomerDeploymentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4337,13 +4287,15 @@ impl<'a, C> CustomerDeploymentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4593,25 +4545,15 @@ impl<'a, C> CustomerDeploymentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4619,13 +4561,15 @@ impl<'a, C> CustomerDeploymentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4902,25 +4846,15 @@ impl<'a, C> CustomerDeploymentMoveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4928,13 +4862,15 @@ impl<'a, C> CustomerDeploymentMoveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5204,25 +5140,15 @@ impl<'a, C> CustomerDeploymentPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5230,13 +5156,15 @@ impl<'a, C> CustomerDeploymentPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5508,25 +5436,15 @@ impl<'a, C> CustomerDeviceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5534,13 +5452,15 @@ impl<'a, C> CustomerDeviceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5805,25 +5725,15 @@ impl<'a, C> CustomerDeviceCreateSignedCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5831,13 +5741,15 @@ impl<'a, C> CustomerDeviceCreateSignedCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6081,25 +5993,15 @@ impl<'a, C> CustomerDeviceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6107,13 +6009,15 @@ impl<'a, C> CustomerDeviceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6348,25 +6252,15 @@ impl<'a, C> CustomerDeviceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6374,13 +6268,15 @@ impl<'a, C> CustomerDeviceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6630,25 +6526,15 @@ impl<'a, C> CustomerDeviceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6656,13 +6542,15 @@ impl<'a, C> CustomerDeviceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6939,25 +6827,15 @@ impl<'a, C> CustomerDeviceMoveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6965,13 +6843,15 @@ impl<'a, C> CustomerDeviceMoveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7241,25 +7121,15 @@ impl<'a, C> CustomerDevicePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7267,13 +7137,15 @@ impl<'a, C> CustomerDevicePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7545,25 +7417,15 @@ impl<'a, C> CustomerDeviceSignDeviceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7571,13 +7433,15 @@ impl<'a, C> CustomerDeviceSignDeviceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7842,25 +7706,15 @@ impl<'a, C> CustomerDeviceUpdateSignedCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7868,13 +7722,15 @@ impl<'a, C> CustomerDeviceUpdateSignedCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8139,25 +7995,15 @@ impl<'a, C> CustomerNodeDeploymentCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8165,13 +8011,15 @@ impl<'a, C> CustomerNodeDeploymentCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8430,25 +8278,15 @@ impl<'a, C> CustomerNodeDeploymentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8456,13 +8294,15 @@ impl<'a, C> CustomerNodeDeploymentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8739,25 +8579,15 @@ impl<'a, C> CustomerNodeDeviceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8765,13 +8595,15 @@ impl<'a, C> CustomerNodeDeviceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9036,25 +8868,15 @@ impl<'a, C> CustomerNodeDeviceCreateSignedCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9062,13 +8884,15 @@ impl<'a, C> CustomerNodeDeviceCreateSignedCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9327,25 +9151,15 @@ impl<'a, C> CustomerNodeDeviceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9353,13 +9167,15 @@ impl<'a, C> CustomerNodeDeviceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9636,25 +9452,15 @@ impl<'a, C> CustomerNodeNodeCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9662,13 +9468,15 @@ impl<'a, C> CustomerNodeNodeCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9927,25 +9735,15 @@ impl<'a, C> CustomerNodeNodeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9953,13 +9751,15 @@ impl<'a, C> CustomerNodeNodeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10236,25 +10036,15 @@ impl<'a, C> CustomerNodeCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10262,13 +10052,15 @@ impl<'a, C> CustomerNodeCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10512,25 +10304,15 @@ impl<'a, C> CustomerNodeDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10538,13 +10320,15 @@ impl<'a, C> CustomerNodeDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10779,25 +10563,15 @@ impl<'a, C> CustomerNodeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10805,13 +10579,15 @@ impl<'a, C> CustomerNodeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11061,25 +10837,15 @@ impl<'a, C> CustomerNodeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11087,13 +10853,15 @@ impl<'a, C> CustomerNodeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11370,25 +11138,15 @@ impl<'a, C> CustomerNodeMoveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11396,13 +11154,15 @@ impl<'a, C> CustomerNodeMoveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11672,25 +11432,15 @@ impl<'a, C> CustomerNodePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11698,13 +11448,15 @@ impl<'a, C> CustomerNodePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11955,25 +11707,15 @@ impl<'a, C> CustomerGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11981,13 +11723,15 @@ impl<'a, C> CustomerGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12205,25 +11949,15 @@ impl<'a, C> CustomerListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12231,13 +11965,15 @@ impl<'a, C> CustomerListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12502,25 +12238,15 @@ impl<'a, C> CustomerPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12528,13 +12254,15 @@ impl<'a, C> CustomerPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12785,25 +12513,15 @@ impl<'a, C> DeploymentDeviceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12811,13 +12529,15 @@ impl<'a, C> DeploymentDeviceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13052,25 +12772,15 @@ impl<'a, C> DeploymentDeviceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13078,13 +12788,15 @@ impl<'a, C> DeploymentDeviceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13340,25 +13052,15 @@ impl<'a, C> DeploymentDeviceMoveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13366,13 +13068,15 @@ impl<'a, C> DeploymentDeviceMoveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13642,25 +13346,15 @@ impl<'a, C> DeploymentDevicePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13668,13 +13362,15 @@ impl<'a, C> DeploymentDevicePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13946,25 +13642,15 @@ impl<'a, C> DeploymentDeviceSignDeviceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13972,13 +13658,15 @@ impl<'a, C> DeploymentDeviceSignDeviceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14243,25 +13931,15 @@ impl<'a, C> DeploymentDeviceUpdateSignedCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14269,13 +13947,15 @@ impl<'a, C> DeploymentDeviceUpdateSignedCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14519,25 +14199,15 @@ impl<'a, C> DeploymentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14545,13 +14215,15 @@ impl<'a, C> DeploymentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14780,25 +14452,15 @@ impl<'a, C> InstallerGenerateSecretCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14806,13 +14468,15 @@ impl<'a, C> InstallerGenerateSecretCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15040,25 +14704,15 @@ impl<'a, C> InstallerValidateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15066,13 +14720,15 @@ impl<'a, C> InstallerValidateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15327,25 +14983,15 @@ impl<'a, C> NodeDeploymentDeviceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15353,13 +14999,15 @@ impl<'a, C> NodeDeploymentDeviceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15624,25 +15272,15 @@ impl<'a, C> NodeDeploymentDeviceCreateSignedCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15650,13 +15288,15 @@ impl<'a, C> NodeDeploymentDeviceCreateSignedCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15915,25 +15555,15 @@ impl<'a, C> NodeDeploymentDeviceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15941,13 +15571,15 @@ impl<'a, C> NodeDeploymentDeviceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16203,25 +15835,15 @@ impl<'a, C> NodeDeploymentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16229,13 +15851,15 @@ impl<'a, C> NodeDeploymentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16470,25 +16094,15 @@ impl<'a, C> NodeDeploymentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16496,13 +16110,15 @@ impl<'a, C> NodeDeploymentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16752,25 +16368,15 @@ impl<'a, C> NodeDeploymentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16778,13 +16384,15 @@ impl<'a, C> NodeDeploymentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17061,25 +16669,15 @@ impl<'a, C> NodeDeploymentMoveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17087,13 +16685,15 @@ impl<'a, C> NodeDeploymentMoveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17363,25 +16963,15 @@ impl<'a, C> NodeDeploymentPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17389,13 +16979,15 @@ impl<'a, C> NodeDeploymentPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17667,25 +17259,15 @@ impl<'a, C> NodeDeviceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17693,13 +17275,15 @@ impl<'a, C> NodeDeviceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17964,25 +17548,15 @@ impl<'a, C> NodeDeviceCreateSignedCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17990,13 +17564,15 @@ impl<'a, C> NodeDeviceCreateSignedCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18240,25 +17816,15 @@ impl<'a, C> NodeDeviceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18266,13 +17832,15 @@ impl<'a, C> NodeDeviceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18507,25 +18075,15 @@ impl<'a, C> NodeDeviceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18533,13 +18091,15 @@ impl<'a, C> NodeDeviceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18789,25 +18349,15 @@ impl<'a, C> NodeDeviceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18815,13 +18365,15 @@ impl<'a, C> NodeDeviceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19098,25 +18650,15 @@ impl<'a, C> NodeDeviceMoveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19124,13 +18666,15 @@ impl<'a, C> NodeDeviceMoveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19400,25 +18944,15 @@ impl<'a, C> NodeDevicePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19426,13 +18960,15 @@ impl<'a, C> NodeDevicePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19704,25 +19240,15 @@ impl<'a, C> NodeDeviceSignDeviceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19730,13 +19256,15 @@ impl<'a, C> NodeDeviceSignDeviceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20001,25 +19529,15 @@ impl<'a, C> NodeDeviceUpdateSignedCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20027,13 +19545,15 @@ impl<'a, C> NodeDeviceUpdateSignedCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20298,25 +19818,15 @@ impl<'a, C> NodeNodeDeploymentCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20324,13 +19834,15 @@ impl<'a, C> NodeNodeDeploymentCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20589,25 +20101,15 @@ impl<'a, C> NodeNodeDeploymentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20615,13 +20117,15 @@ impl<'a, C> NodeNodeDeploymentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20898,25 +20402,15 @@ impl<'a, C> NodeNodeDeviceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20924,13 +20418,15 @@ impl<'a, C> NodeNodeDeviceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21195,25 +20691,15 @@ impl<'a, C> NodeNodeDeviceCreateSignedCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21221,13 +20707,15 @@ impl<'a, C> NodeNodeDeviceCreateSignedCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21486,25 +20974,15 @@ impl<'a, C> NodeNodeDeviceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21512,13 +20990,15 @@ impl<'a, C> NodeNodeDeviceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21795,25 +21275,15 @@ impl<'a, C> NodeNodeNodeCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21821,13 +21291,15 @@ impl<'a, C> NodeNodeNodeCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22086,25 +21558,15 @@ impl<'a, C> NodeNodeNodeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22112,13 +21574,15 @@ impl<'a, C> NodeNodeNodeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22395,25 +21859,15 @@ impl<'a, C> NodeNodeCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22421,13 +21875,15 @@ impl<'a, C> NodeNodeCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22671,25 +22127,15 @@ impl<'a, C> NodeNodeDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22697,13 +22143,15 @@ impl<'a, C> NodeNodeDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22938,25 +22386,15 @@ impl<'a, C> NodeNodeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22964,13 +22402,15 @@ impl<'a, C> NodeNodeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23220,25 +22660,15 @@ impl<'a, C> NodeNodeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23246,13 +22676,15 @@ impl<'a, C> NodeNodeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23529,25 +22961,15 @@ impl<'a, C> NodeNodeMoveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23555,13 +22977,15 @@ impl<'a, C> NodeNodeMoveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23831,25 +23255,15 @@ impl<'a, C> NodeNodePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23857,13 +23271,15 @@ impl<'a, C> NodeNodePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24114,25 +23530,15 @@ impl<'a, C> NodeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24140,13 +23546,15 @@ impl<'a, C> NodeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24375,25 +23783,15 @@ impl<'a, C> PolicyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24401,13 +23799,15 @@ impl<'a, C> PolicyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24635,25 +24035,15 @@ impl<'a, C> PolicySetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24661,13 +24051,15 @@ impl<'a, C> PolicySetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24895,25 +24287,15 @@ impl<'a, C> PolicyTestCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24921,13 +24303,15 @@ impl<'a, C> PolicyTestCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/sasportal1_alpha1/src/client.rs b/gen/sasportal1_alpha1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/sasportal1_alpha1/src/client.rs +++ b/gen/sasportal1_alpha1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/searchconsole1/src/api.rs b/gen/searchconsole1/src/api.rs index eddbf98317..9583c2172c 100644 --- a/gen/searchconsole1/src/api.rs +++ b/gen/searchconsole1/src/api.rs @@ -1048,25 +1048,15 @@ impl<'a, C> SearchanalyticQueryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1074,13 +1064,15 @@ impl<'a, C> SearchanalyticQueryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1321,25 +1313,15 @@ impl<'a, C> SitemapDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1347,11 +1329,11 @@ impl<'a, C> SitemapDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -1588,25 +1570,15 @@ impl<'a, C> SitemapGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1614,13 +1586,15 @@ impl<'a, C> SitemapGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1866,25 +1840,15 @@ impl<'a, C> SitemapListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1892,13 +1856,15 @@ impl<'a, C> SitemapListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2137,25 +2103,15 @@ impl<'a, C> SitemapSubmitCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2163,11 +2119,11 @@ impl<'a, C> SitemapSubmitCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -2401,25 +2357,15 @@ impl<'a, C> SiteAddCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2427,11 +2373,11 @@ impl<'a, C> SiteAddCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -2655,25 +2601,15 @@ impl<'a, C> SiteDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2681,11 +2617,11 @@ impl<'a, C> SiteDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -2910,25 +2846,15 @@ impl<'a, C> SiteGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2936,13 +2862,15 @@ impl<'a, C> SiteGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3150,25 +3078,15 @@ impl<'a, C> SiteListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3176,13 +3094,15 @@ impl<'a, C> SiteListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3393,25 +3313,15 @@ impl<'a, C> UrlTestingToolMobileFriendlyTestRunCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3419,13 +3329,15 @@ impl<'a, C> UrlTestingToolMobileFriendlyTestRunCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/searchconsole1/src/client.rs b/gen/searchconsole1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/searchconsole1/src/client.rs +++ b/gen/searchconsole1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/secretmanager1-cli/src/main.rs b/gen/secretmanager1-cli/src/main.rs index c1edf17f33..251aa309ab 100644 --- a/gen/secretmanager1-cli/src/main.rs +++ b/gen/secretmanager1-cli/src/main.rs @@ -122,7 +122,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/secretmanager1/src/api.rs b/gen/secretmanager1/src/api.rs index 7210f0b890..72afdfb828 100644 --- a/gen/secretmanager1/src/api.rs +++ b/gen/secretmanager1/src/api.rs @@ -1282,25 +1282,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1308,13 +1298,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1564,25 +1556,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1590,13 +1572,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1852,25 +1836,15 @@ impl<'a, C> ProjectSecretVersionAccesCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1878,13 +1852,15 @@ impl<'a, C> ProjectSecretVersionAccesCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2140,25 +2116,15 @@ impl<'a, C> ProjectSecretVersionDestroyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2166,13 +2132,15 @@ impl<'a, C> ProjectSecretVersionDestroyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2437,25 +2405,15 @@ impl<'a, C> ProjectSecretVersionDisableCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2463,13 +2421,15 @@ impl<'a, C> ProjectSecretVersionDisableCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2734,25 +2694,15 @@ impl<'a, C> ProjectSecretVersionEnableCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2760,13 +2710,15 @@ impl<'a, C> ProjectSecretVersionEnableCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3010,25 +2962,15 @@ impl<'a, C> ProjectSecretVersionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3036,13 +2978,15 @@ impl<'a, C> ProjectSecretVersionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3287,25 +3231,15 @@ impl<'a, C> ProjectSecretVersionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3313,13 +3247,15 @@ impl<'a, C> ProjectSecretVersionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3589,25 +3525,15 @@ impl<'a, C> ProjectSecretAddVersionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3615,13 +3541,15 @@ impl<'a, C> ProjectSecretAddVersionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3891,25 +3819,15 @@ impl<'a, C> ProjectSecretCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3917,13 +3835,15 @@ impl<'a, C> ProjectSecretCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4174,25 +4094,15 @@ impl<'a, C> ProjectSecretDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4200,13 +4110,15 @@ impl<'a, C> ProjectSecretDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4441,25 +4353,15 @@ impl<'a, C> ProjectSecretGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4467,13 +4369,15 @@ impl<'a, C> ProjectSecretGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4713,25 +4617,15 @@ impl<'a, C> ProjectSecretGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4739,13 +4633,15 @@ impl<'a, C> ProjectSecretGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4997,25 +4893,15 @@ impl<'a, C> ProjectSecretListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5023,13 +4909,15 @@ impl<'a, C> ProjectSecretListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5304,25 +5192,15 @@ impl<'a, C> ProjectSecretPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5330,13 +5208,15 @@ impl<'a, C> ProjectSecretPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5608,25 +5488,15 @@ impl<'a, C> ProjectSecretSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5634,13 +5504,15 @@ impl<'a, C> ProjectSecretSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5905,25 +5777,15 @@ impl<'a, C> ProjectSecretTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5931,13 +5793,15 @@ impl<'a, C> ProjectSecretTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/secretmanager1/src/client.rs b/gen/secretmanager1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/secretmanager1/src/client.rs +++ b/gen/secretmanager1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/secretmanager1_beta1-cli/src/main.rs b/gen/secretmanager1_beta1-cli/src/main.rs index 2fc9576722..dc252f2f80 100644 --- a/gen/secretmanager1_beta1-cli/src/main.rs +++ b/gen/secretmanager1_beta1-cli/src/main.rs @@ -122,7 +122,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/secretmanager1_beta1/src/api.rs b/gen/secretmanager1_beta1/src/api.rs index 80905304a9..be851be950 100644 --- a/gen/secretmanager1_beta1/src/api.rs +++ b/gen/secretmanager1_beta1/src/api.rs @@ -1146,25 +1146,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1172,13 +1162,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1428,25 +1420,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1454,13 +1436,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1716,25 +1700,15 @@ impl<'a, C> ProjectSecretVersionAccesCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1742,13 +1716,15 @@ impl<'a, C> ProjectSecretVersionAccesCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2004,25 +1980,15 @@ impl<'a, C> ProjectSecretVersionDestroyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2030,13 +1996,15 @@ impl<'a, C> ProjectSecretVersionDestroyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2301,25 +2269,15 @@ impl<'a, C> ProjectSecretVersionDisableCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2327,13 +2285,15 @@ impl<'a, C> ProjectSecretVersionDisableCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2598,25 +2558,15 @@ impl<'a, C> ProjectSecretVersionEnableCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2624,13 +2574,15 @@ impl<'a, C> ProjectSecretVersionEnableCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2874,25 +2826,15 @@ impl<'a, C> ProjectSecretVersionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2900,13 +2842,15 @@ impl<'a, C> ProjectSecretVersionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3151,25 +3095,15 @@ impl<'a, C> ProjectSecretVersionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3177,13 +3111,15 @@ impl<'a, C> ProjectSecretVersionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3453,25 +3389,15 @@ impl<'a, C> ProjectSecretAddVersionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3479,13 +3405,15 @@ impl<'a, C> ProjectSecretAddVersionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3755,25 +3683,15 @@ impl<'a, C> ProjectSecretCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3781,13 +3699,15 @@ impl<'a, C> ProjectSecretCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4038,25 +3958,15 @@ impl<'a, C> ProjectSecretDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4064,13 +3974,15 @@ impl<'a, C> ProjectSecretDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4305,25 +4217,15 @@ impl<'a, C> ProjectSecretGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4331,13 +4233,15 @@ impl<'a, C> ProjectSecretGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4577,25 +4481,15 @@ impl<'a, C> ProjectSecretGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4603,13 +4497,15 @@ impl<'a, C> ProjectSecretGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4861,25 +4757,15 @@ impl<'a, C> ProjectSecretListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4887,13 +4773,15 @@ impl<'a, C> ProjectSecretListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5168,25 +5056,15 @@ impl<'a, C> ProjectSecretPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5194,13 +5072,15 @@ impl<'a, C> ProjectSecretPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5472,25 +5352,15 @@ impl<'a, C> ProjectSecretSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5498,13 +5368,15 @@ impl<'a, C> ProjectSecretSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5769,25 +5641,15 @@ impl<'a, C> ProjectSecretTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5795,13 +5657,15 @@ impl<'a, C> ProjectSecretTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/secretmanager1_beta1/src/client.rs b/gen/secretmanager1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/secretmanager1_beta1/src/client.rs +++ b/gen/secretmanager1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/securitycenter1-cli/src/main.rs b/gen/securitycenter1-cli/src/main.rs index fbacb3a213..b08bfa8cfa 100644 --- a/gen/securitycenter1-cli/src/main.rs +++ b/gen/securitycenter1-cli/src/main.rs @@ -172,7 +172,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "read-time", "compare-duration", "order-by", "filter", "field-mask", "page-token"].iter().map(|v|*v)); + v.extend(["compare-duration", "field-mask", "filter", "order-by", "page-size", "page-token", "read-time"].iter().map(|v|*v)); v } )); } } @@ -430,7 +430,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "read-time", "compare-duration", "order-by", "filter", "field-mask", "page-token"].iter().map(|v|*v)); + v.extend(["compare-duration", "field-mask", "filter", "order-by", "page-size", "page-token", "read-time"].iter().map(|v|*v)); v } )); } } @@ -934,7 +934,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "read-time", "compare-duration", "order-by", "filter", "field-mask", "page-token"].iter().map(|v|*v)); + v.extend(["compare-duration", "field-mask", "filter", "order-by", "page-size", "page-token", "read-time"].iter().map(|v|*v)); v } )); } } @@ -2084,7 +2084,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "read-time", "compare-duration", "order-by", "filter", "field-mask", "page-token"].iter().map(|v|*v)); + v.extend(["compare-duration", "field-mask", "filter", "order-by", "page-size", "page-token", "read-time"].iter().map(|v|*v)); v } )); } } @@ -3082,7 +3082,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "read-time", "compare-duration", "order-by", "filter", "field-mask", "page-token"].iter().map(|v|*v)); + v.extend(["compare-duration", "field-mask", "filter", "order-by", "page-size", "page-token", "read-time"].iter().map(|v|*v)); v } )); } } @@ -3340,7 +3340,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "read-time", "compare-duration", "order-by", "filter", "field-mask", "page-token"].iter().map(|v|*v)); + v.extend(["compare-duration", "field-mask", "filter", "order-by", "page-size", "page-token", "read-time"].iter().map(|v|*v)); v } )); } } diff --git a/gen/securitycenter1/src/api.rs b/gen/securitycenter1/src/api.rs index 72034f469a..a58dc526ae 100644 --- a/gen/securitycenter1/src/api.rs +++ b/gen/securitycenter1/src/api.rs @@ -2319,25 +2319,15 @@ impl<'a, C> FolderAssetGroupCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2345,13 +2335,15 @@ impl<'a, C> FolderAssetGroupCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2630,25 +2622,15 @@ impl<'a, C> FolderAssetListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2656,13 +2638,15 @@ impl<'a, C> FolderAssetListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2977,25 +2961,15 @@ impl<'a, C> FolderAssetUpdateSecurityMarkCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3003,13 +2977,15 @@ impl<'a, C> FolderAssetUpdateSecurityMarkCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3288,25 +3264,15 @@ impl<'a, C> FolderSourceFindingGroupCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3314,13 +3280,15 @@ impl<'a, C> FolderSourceFindingGroupCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3599,25 +3567,15 @@ impl<'a, C> FolderSourceFindingListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3625,13 +3583,15 @@ impl<'a, C> FolderSourceFindingListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3941,25 +3901,15 @@ impl<'a, C> FolderSourceFindingPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3967,13 +3917,15 @@ impl<'a, C> FolderSourceFindingPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4245,25 +4197,15 @@ impl<'a, C> FolderSourceFindingSetStateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4271,13 +4213,15 @@ impl<'a, C> FolderSourceFindingSetStateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4552,25 +4496,15 @@ impl<'a, C> FolderSourceFindingUpdateSecurityMarkCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4578,13 +4512,15 @@ impl<'a, C> FolderSourceFindingUpdateSecurityMarkCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4852,25 +4788,15 @@ impl<'a, C> FolderSourceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4878,13 +4804,15 @@ impl<'a, C> FolderSourceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5154,25 +5082,15 @@ impl<'a, C> OrganizationAssetGroupCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5180,13 +5098,15 @@ impl<'a, C> OrganizationAssetGroupCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5465,25 +5385,15 @@ impl<'a, C> OrganizationAssetListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5491,13 +5401,15 @@ impl<'a, C> OrganizationAssetListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5802,25 +5714,15 @@ impl<'a, C> OrganizationAssetRunDiscoveryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5828,13 +5730,15 @@ impl<'a, C> OrganizationAssetRunDiscoveryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6109,25 +6013,15 @@ impl<'a, C> OrganizationAssetUpdateSecurityMarkCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6135,13 +6029,15 @@ impl<'a, C> OrganizationAssetUpdateSecurityMarkCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6425,25 +6321,15 @@ impl<'a, C> OrganizationNotificationConfigCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6451,13 +6337,15 @@ impl<'a, C> OrganizationNotificationConfigCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6708,25 +6596,15 @@ impl<'a, C> OrganizationNotificationConfigDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6734,13 +6612,15 @@ impl<'a, C> OrganizationNotificationConfigDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6975,25 +6855,15 @@ impl<'a, C> OrganizationNotificationConfigGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7001,13 +6871,15 @@ impl<'a, C> OrganizationNotificationConfigGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7252,25 +7124,15 @@ impl<'a, C> OrganizationNotificationConfigListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7278,13 +7140,15 @@ impl<'a, C> OrganizationNotificationConfigListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7559,25 +7423,15 @@ impl<'a, C> OrganizationNotificationConfigPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7585,13 +7439,15 @@ impl<'a, C> OrganizationNotificationConfigPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7842,25 +7698,15 @@ impl<'a, C> OrganizationOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7868,13 +7714,15 @@ impl<'a, C> OrganizationOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8109,25 +7957,15 @@ impl<'a, C> OrganizationOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8135,13 +7973,15 @@ impl<'a, C> OrganizationOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8376,25 +8216,15 @@ impl<'a, C> OrganizationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8402,13 +8232,15 @@ impl<'a, C> OrganizationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8658,25 +8490,15 @@ impl<'a, C> OrganizationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8684,13 +8506,15 @@ impl<'a, C> OrganizationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8972,25 +8796,15 @@ impl<'a, C> OrganizationSourceFindingCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8998,13 +8812,15 @@ impl<'a, C> OrganizationSourceFindingCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9276,25 +9092,15 @@ impl<'a, C> OrganizationSourceFindingGroupCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9302,13 +9108,15 @@ impl<'a, C> OrganizationSourceFindingGroupCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9587,25 +9395,15 @@ impl<'a, C> OrganizationSourceFindingListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9613,13 +9411,15 @@ impl<'a, C> OrganizationSourceFindingListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9929,25 +9729,15 @@ impl<'a, C> OrganizationSourceFindingPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9955,13 +9745,15 @@ impl<'a, C> OrganizationSourceFindingPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10233,25 +10025,15 @@ impl<'a, C> OrganizationSourceFindingSetStateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10259,13 +10041,15 @@ impl<'a, C> OrganizationSourceFindingSetStateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10540,25 +10324,15 @@ impl<'a, C> OrganizationSourceFindingUpdateSecurityMarkCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10566,13 +10340,15 @@ impl<'a, C> OrganizationSourceFindingUpdateSecurityMarkCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10851,25 +10627,15 @@ impl<'a, C> OrganizationSourceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10877,13 +10643,15 @@ impl<'a, C> OrganizationSourceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11127,25 +10895,15 @@ impl<'a, C> OrganizationSourceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11153,13 +10911,15 @@ impl<'a, C> OrganizationSourceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11415,25 +11175,15 @@ impl<'a, C> OrganizationSourceGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11441,13 +11191,15 @@ impl<'a, C> OrganizationSourceGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11701,25 +11453,15 @@ impl<'a, C> OrganizationSourceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11727,13 +11469,15 @@ impl<'a, C> OrganizationSourceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12008,25 +11752,15 @@ impl<'a, C> OrganizationSourcePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12034,13 +11768,15 @@ impl<'a, C> OrganizationSourcePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12312,25 +12048,15 @@ impl<'a, C> OrganizationSourceSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12338,13 +12064,15 @@ impl<'a, C> OrganizationSourceSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12609,25 +12337,15 @@ impl<'a, C> OrganizationSourceTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12635,13 +12353,15 @@ impl<'a, C> OrganizationSourceTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12885,25 +12605,15 @@ impl<'a, C> OrganizationGetOrganizationSettingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12911,13 +12621,15 @@ impl<'a, C> OrganizationGetOrganizationSettingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13178,25 +12890,15 @@ impl<'a, C> OrganizationUpdateOrganizationSettingCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13204,13 +12906,15 @@ impl<'a, C> OrganizationUpdateOrganizationSettingCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13482,25 +13186,15 @@ impl<'a, C> ProjectAssetGroupCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13508,13 +13202,15 @@ impl<'a, C> ProjectAssetGroupCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13793,25 +13489,15 @@ impl<'a, C> ProjectAssetListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13819,13 +13505,15 @@ impl<'a, C> ProjectAssetListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14140,25 +13828,15 @@ impl<'a, C> ProjectAssetUpdateSecurityMarkCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14166,13 +13844,15 @@ impl<'a, C> ProjectAssetUpdateSecurityMarkCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14451,25 +14131,15 @@ impl<'a, C> ProjectSourceFindingGroupCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14477,13 +14147,15 @@ impl<'a, C> ProjectSourceFindingGroupCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14762,25 +14434,15 @@ impl<'a, C> ProjectSourceFindingListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14788,13 +14450,15 @@ impl<'a, C> ProjectSourceFindingListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15104,25 +14768,15 @@ impl<'a, C> ProjectSourceFindingPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15130,13 +14784,15 @@ impl<'a, C> ProjectSourceFindingPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15408,25 +15064,15 @@ impl<'a, C> ProjectSourceFindingSetStateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15434,13 +15080,15 @@ impl<'a, C> ProjectSourceFindingSetStateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15715,25 +15363,15 @@ impl<'a, C> ProjectSourceFindingUpdateSecurityMarkCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15741,13 +15379,15 @@ impl<'a, C> ProjectSourceFindingUpdateSecurityMarkCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16015,25 +15655,15 @@ impl<'a, C> ProjectSourceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16041,13 +15671,15 @@ impl<'a, C> ProjectSourceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/securitycenter1/src/client.rs b/gen/securitycenter1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/securitycenter1/src/client.rs +++ b/gen/securitycenter1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/servicebroker1/src/api.rs b/gen/servicebroker1/src/api.rs index 70645130d6..d53d65bc8d 100644 --- a/gen/servicebroker1/src/api.rs +++ b/gen/servicebroker1/src/api.rs @@ -645,25 +645,15 @@ impl<'a, C> MethodGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -671,13 +661,15 @@ impl<'a, C> MethodGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -935,25 +927,15 @@ impl<'a, C> MethodSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -961,13 +943,15 @@ impl<'a, C> MethodSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1239,25 +1223,15 @@ impl<'a, C> MethodTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1265,13 +1239,15 @@ impl<'a, C> MethodTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/servicebroker1/src/client.rs b/gen/servicebroker1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/servicebroker1/src/client.rs +++ b/gen/servicebroker1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/servicecontrol1/src/api.rs b/gen/servicecontrol1/src/api.rs index 2033cb2128..25c0895472 100644 --- a/gen/servicecontrol1/src/api.rs +++ b/gen/servicecontrol1/src/api.rs @@ -1250,25 +1250,15 @@ impl<'a, C> ServiceAllocateQuotaCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1276,13 +1266,15 @@ impl<'a, C> ServiceAllocateQuotaCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1543,25 +1535,15 @@ impl<'a, C> ServiceCheckCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1569,13 +1551,15 @@ impl<'a, C> ServiceCheckCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1836,25 +1820,15 @@ impl<'a, C> ServiceReportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1862,13 +1836,15 @@ impl<'a, C> ServiceReportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/servicecontrol1/src/client.rs b/gen/servicecontrol1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/servicecontrol1/src/client.rs +++ b/gen/servicecontrol1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/servicecontrol2/src/api.rs b/gen/servicecontrol2/src/api.rs index a607f87ccc..551c8d68f7 100644 --- a/gen/servicecontrol2/src/api.rs +++ b/gen/servicecontrol2/src/api.rs @@ -723,25 +723,15 @@ impl<'a, C> ServiceCheckCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -749,13 +739,15 @@ impl<'a, C> ServiceCheckCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1016,25 +1008,15 @@ impl<'a, C> ServiceReportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1042,13 +1024,15 @@ impl<'a, C> ServiceReportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/servicecontrol2/src/client.rs b/gen/servicecontrol2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/servicecontrol2/src/client.rs +++ b/gen/servicecontrol2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/servicedirectory1-cli/src/main.rs b/gen/servicedirectory1-cli/src/main.rs index 28087e9d87..557dc31b00 100644 --- a/gen/servicedirectory1-cli/src/main.rs +++ b/gen/servicedirectory1-cli/src/main.rs @@ -122,7 +122,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -466,7 +466,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -959,7 +959,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1253,7 +1253,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/servicedirectory1/src/api.rs b/gen/servicedirectory1/src/api.rs index 004c7ed6ca..bc82c93830 100644 --- a/gen/servicedirectory1/src/api.rs +++ b/gen/servicedirectory1/src/api.rs @@ -1237,25 +1237,15 @@ impl<'a, C> ProjectLocationNamespaceServiceEndpointCreateCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1263,13 +1253,15 @@ impl<'a, C> ProjectLocationNamespaceServiceEndpointCreateCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1520,25 +1512,15 @@ impl<'a, C> ProjectLocationNamespaceServiceEndpointDeleteCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1546,13 +1528,15 @@ impl<'a, C> ProjectLocationNamespaceServiceEndpointDeleteCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1787,25 +1771,15 @@ impl<'a, C> ProjectLocationNamespaceServiceEndpointGetCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1813,13 +1787,15 @@ impl<'a, C> ProjectLocationNamespaceServiceEndpointGetCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2074,25 +2050,15 @@ impl<'a, C> ProjectLocationNamespaceServiceEndpointListCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2100,13 +2066,15 @@ impl<'a, C> ProjectLocationNamespaceServiceEndpointListCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2395,25 +2363,15 @@ impl<'a, C> ProjectLocationNamespaceServiceEndpointPatchCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2421,13 +2379,15 @@ impl<'a, C> ProjectLocationNamespaceServiceEndpointPatchCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2704,25 +2664,15 @@ impl<'a, C> ProjectLocationNamespaceServiceCreateCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2730,13 +2680,15 @@ impl<'a, C> ProjectLocationNamespaceServiceCreateCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2987,25 +2939,15 @@ impl<'a, C> ProjectLocationNamespaceServiceDeleteCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3013,13 +2955,15 @@ impl<'a, C> ProjectLocationNamespaceServiceDeleteCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3254,25 +3198,15 @@ impl<'a, C> ProjectLocationNamespaceServiceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3280,13 +3214,15 @@ impl<'a, C> ProjectLocationNamespaceServiceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3542,25 +3478,15 @@ impl<'a, C> ProjectLocationNamespaceServiceGetIamPolicyCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3568,13 +3494,15 @@ impl<'a, C> ProjectLocationNamespaceServiceGetIamPolicyCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3838,25 +3766,15 @@ impl<'a, C> ProjectLocationNamespaceServiceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3864,13 +3782,15 @@ impl<'a, C> ProjectLocationNamespaceServiceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4159,25 +4079,15 @@ impl<'a, C> ProjectLocationNamespaceServicePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4185,13 +4095,15 @@ impl<'a, C> ProjectLocationNamespaceServicePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4463,25 +4375,15 @@ impl<'a, C> ProjectLocationNamespaceServiceResolveCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4489,13 +4391,15 @@ impl<'a, C> ProjectLocationNamespaceServiceResolveCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4760,25 +4664,15 @@ impl<'a, C> ProjectLocationNamespaceServiceSetIamPolicyCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4786,13 +4680,15 @@ impl<'a, C> ProjectLocationNamespaceServiceSetIamPolicyCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5057,25 +4953,15 @@ impl<'a, C> ProjectLocationNamespaceServiceTestIamPermissionCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5083,13 +4969,15 @@ impl<'a, C> ProjectLocationNamespaceServiceTestIamPermissionCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5359,25 +5247,15 @@ impl<'a, C> ProjectLocationNamespaceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5385,13 +5263,15 @@ impl<'a, C> ProjectLocationNamespaceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5642,25 +5522,15 @@ impl<'a, C> ProjectLocationNamespaceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5668,13 +5538,15 @@ impl<'a, C> ProjectLocationNamespaceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5909,25 +5781,15 @@ impl<'a, C> ProjectLocationNamespaceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5935,13 +5797,15 @@ impl<'a, C> ProjectLocationNamespaceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6197,25 +6061,15 @@ impl<'a, C> ProjectLocationNamespaceGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6223,13 +6077,15 @@ impl<'a, C> ProjectLocationNamespaceGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6493,25 +6349,15 @@ impl<'a, C> ProjectLocationNamespaceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6519,13 +6365,15 @@ impl<'a, C> ProjectLocationNamespaceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6814,25 +6662,15 @@ impl<'a, C> ProjectLocationNamespacePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6840,13 +6678,15 @@ impl<'a, C> ProjectLocationNamespacePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7118,25 +6958,15 @@ impl<'a, C> ProjectLocationNamespaceSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7144,13 +6974,15 @@ impl<'a, C> ProjectLocationNamespaceSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7415,25 +7247,15 @@ impl<'a, C> ProjectLocationNamespaceTestIamPermissionCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7441,13 +7263,15 @@ impl<'a, C> ProjectLocationNamespaceTestIamPermissionCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7691,25 +7515,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7717,13 +7531,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7973,25 +7789,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7999,13 +7805,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/servicedirectory1/src/client.rs b/gen/servicedirectory1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/servicedirectory1/src/client.rs +++ b/gen/servicedirectory1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/servicedirectory1_beta1-cli/src/main.rs b/gen/servicedirectory1_beta1-cli/src/main.rs index b046b569a7..e994f7abff 100644 --- a/gen/servicedirectory1_beta1-cli/src/main.rs +++ b/gen/servicedirectory1_beta1-cli/src/main.rs @@ -122,7 +122,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -466,7 +466,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "order-by", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -959,7 +959,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "order-by", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1253,7 +1253,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "order-by", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/servicedirectory1_beta1/src/api.rs b/gen/servicedirectory1_beta1/src/api.rs index d1961da2ee..d0a61a85d1 100644 --- a/gen/servicedirectory1_beta1/src/api.rs +++ b/gen/servicedirectory1_beta1/src/api.rs @@ -1237,25 +1237,15 @@ impl<'a, C> ProjectLocationNamespaceServiceEndpointCreateCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1263,13 +1253,15 @@ impl<'a, C> ProjectLocationNamespaceServiceEndpointCreateCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1520,25 +1512,15 @@ impl<'a, C> ProjectLocationNamespaceServiceEndpointDeleteCall<'a, C> where C: Bo return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1546,13 +1528,15 @@ impl<'a, C> ProjectLocationNamespaceServiceEndpointDeleteCall<'a, C> where C: Bo } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1787,25 +1771,15 @@ impl<'a, C> ProjectLocationNamespaceServiceEndpointGetCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1813,13 +1787,15 @@ impl<'a, C> ProjectLocationNamespaceServiceEndpointGetCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2074,25 +2050,15 @@ impl<'a, C> ProjectLocationNamespaceServiceEndpointListCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2100,13 +2066,15 @@ impl<'a, C> ProjectLocationNamespaceServiceEndpointListCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2395,25 +2363,15 @@ impl<'a, C> ProjectLocationNamespaceServiceEndpointPatchCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2421,13 +2379,15 @@ impl<'a, C> ProjectLocationNamespaceServiceEndpointPatchCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2704,25 +2664,15 @@ impl<'a, C> ProjectLocationNamespaceServiceCreateCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2730,13 +2680,15 @@ impl<'a, C> ProjectLocationNamespaceServiceCreateCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2987,25 +2939,15 @@ impl<'a, C> ProjectLocationNamespaceServiceDeleteCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3013,13 +2955,15 @@ impl<'a, C> ProjectLocationNamespaceServiceDeleteCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3254,25 +3198,15 @@ impl<'a, C> ProjectLocationNamespaceServiceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3280,13 +3214,15 @@ impl<'a, C> ProjectLocationNamespaceServiceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3542,25 +3478,15 @@ impl<'a, C> ProjectLocationNamespaceServiceGetIamPolicyCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3568,13 +3494,15 @@ impl<'a, C> ProjectLocationNamespaceServiceGetIamPolicyCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3838,25 +3766,15 @@ impl<'a, C> ProjectLocationNamespaceServiceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3864,13 +3782,15 @@ impl<'a, C> ProjectLocationNamespaceServiceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4159,25 +4079,15 @@ impl<'a, C> ProjectLocationNamespaceServicePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4185,13 +4095,15 @@ impl<'a, C> ProjectLocationNamespaceServicePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4463,25 +4375,15 @@ impl<'a, C> ProjectLocationNamespaceServiceResolveCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4489,13 +4391,15 @@ impl<'a, C> ProjectLocationNamespaceServiceResolveCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4760,25 +4664,15 @@ impl<'a, C> ProjectLocationNamespaceServiceSetIamPolicyCall<'a, C> where C: Borr return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4786,13 +4680,15 @@ impl<'a, C> ProjectLocationNamespaceServiceSetIamPolicyCall<'a, C> where C: Borr } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5057,25 +4953,15 @@ impl<'a, C> ProjectLocationNamespaceServiceTestIamPermissionCall<'a, C> where C: return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5083,13 +4969,15 @@ impl<'a, C> ProjectLocationNamespaceServiceTestIamPermissionCall<'a, C> where C: } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5359,25 +5247,15 @@ impl<'a, C> ProjectLocationNamespaceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5385,13 +5263,15 @@ impl<'a, C> ProjectLocationNamespaceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5642,25 +5522,15 @@ impl<'a, C> ProjectLocationNamespaceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5668,13 +5538,15 @@ impl<'a, C> ProjectLocationNamespaceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5909,25 +5781,15 @@ impl<'a, C> ProjectLocationNamespaceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5935,13 +5797,15 @@ impl<'a, C> ProjectLocationNamespaceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6197,25 +6061,15 @@ impl<'a, C> ProjectLocationNamespaceGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6223,13 +6077,15 @@ impl<'a, C> ProjectLocationNamespaceGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6493,25 +6349,15 @@ impl<'a, C> ProjectLocationNamespaceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6519,13 +6365,15 @@ impl<'a, C> ProjectLocationNamespaceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6814,25 +6662,15 @@ impl<'a, C> ProjectLocationNamespacePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6840,13 +6678,15 @@ impl<'a, C> ProjectLocationNamespacePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7118,25 +6958,15 @@ impl<'a, C> ProjectLocationNamespaceSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7144,13 +6974,15 @@ impl<'a, C> ProjectLocationNamespaceSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7415,25 +7247,15 @@ impl<'a, C> ProjectLocationNamespaceTestIamPermissionCall<'a, C> where C: Borrow return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7441,13 +7263,15 @@ impl<'a, C> ProjectLocationNamespaceTestIamPermissionCall<'a, C> where C: Borrow } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7691,25 +7515,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7717,13 +7531,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7973,25 +7789,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7999,13 +7805,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/servicedirectory1_beta1/src/client.rs b/gen/servicedirectory1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/servicedirectory1_beta1/src/client.rs +++ b/gen/servicedirectory1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/serviceregistryalpha-cli/src/main.rs b/gen/serviceregistryalpha-cli/src/main.rs index 2fda3a5a41..d31ce8bad8 100644 --- a/gen/serviceregistryalpha-cli/src/main.rs +++ b/gen/serviceregistryalpha-cli/src/main.rs @@ -271,7 +271,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "order-by", "max-results", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token"].iter().map(|v|*v)); v } )); } } @@ -576,7 +576,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["filter", "order-by", "max-results", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "order-by", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/serviceregistryalpha/src/api.rs b/gen/serviceregistryalpha/src/api.rs index fe7e16e217..33514ae349 100644 --- a/gen/serviceregistryalpha/src/api.rs +++ b/gen/serviceregistryalpha/src/api.rs @@ -823,25 +823,15 @@ impl<'a, C> EndpointDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -849,13 +839,15 @@ impl<'a, C> EndpointDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1094,25 +1086,15 @@ impl<'a, C> EndpointGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1120,13 +1102,15 @@ impl<'a, C> EndpointGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1384,25 +1368,15 @@ impl<'a, C> EndpointInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1410,13 +1384,15 @@ impl<'a, C> EndpointInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1672,25 +1648,15 @@ impl<'a, C> EndpointListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1698,13 +1664,15 @@ impl<'a, C> EndpointListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1994,25 +1962,15 @@ impl<'a, C> EndpointPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2020,13 +1978,15 @@ impl<'a, C> EndpointPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2295,25 +2255,15 @@ impl<'a, C> EndpointUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2321,13 +2271,15 @@ impl<'a, C> EndpointUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2575,25 +2527,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2601,13 +2543,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2864,25 +2808,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2890,13 +2824,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/serviceregistryalpha/src/client.rs b/gen/serviceregistryalpha/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/serviceregistryalpha/src/client.rs +++ b/gen/serviceregistryalpha/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/sheets4-cli/src/main.rs b/gen/sheets4-cli/src/main.rs index 7fb90b2bd0..3c0321d71a 100644 --- a/gen/sheets4-cli/src/main.rs +++ b/gen/sheets4-cli/src/main.rs @@ -466,7 +466,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["ranges", "include-grid-data"].iter().map(|v|*v)); + v.extend(["include-grid-data", "ranges"].iter().map(|v|*v)); v } )); } } @@ -739,7 +739,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["value-input-option", "include-values-in-response", "response-date-time-render-option", "response-value-render-option", "insert-data-option"].iter().map(|v|*v)); + v.extend(["include-values-in-response", "insert-data-option", "response-date-time-render-option", "response-value-render-option", "value-input-option"].iter().map(|v|*v)); v } )); } } @@ -973,7 +973,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["major-dimension", "value-render-option", "date-time-render-option", "ranges"].iter().map(|v|*v)); + v.extend(["date-time-render-option", "major-dimension", "ranges", "value-render-option"].iter().map(|v|*v)); v } )); } } @@ -1382,7 +1382,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["major-dimension", "value-render-option", "date-time-render-option"].iter().map(|v|*v)); + v.extend(["date-time-render-option", "major-dimension", "value-render-option"].iter().map(|v|*v)); v } )); } } @@ -1481,7 +1481,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["response-date-time-render-option", "value-input-option", "response-value-render-option", "include-values-in-response"].iter().map(|v|*v)); + v.extend(["include-values-in-response", "response-date-time-render-option", "response-value-render-option", "value-input-option"].iter().map(|v|*v)); v } )); } } diff --git a/gen/sheets4/src/api.rs b/gen/sheets4/src/api.rs index 957ba9c81c..9c56436c7e 100644 --- a/gen/sheets4/src/api.rs +++ b/gen/sheets4/src/api.rs @@ -5978,25 +5978,15 @@ impl<'a, C> SpreadsheetDeveloperMetadataGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6004,13 +5994,15 @@ impl<'a, C> SpreadsheetDeveloperMetadataGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6272,25 +6264,15 @@ impl<'a, C> SpreadsheetDeveloperMetadataSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6298,13 +6280,15 @@ impl<'a, C> SpreadsheetDeveloperMetadataSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6567,25 +6551,15 @@ impl<'a, C> SpreadsheetSheetCopyToCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6593,13 +6567,15 @@ impl<'a, C> SpreadsheetSheetCopyToCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6897,25 +6873,15 @@ impl<'a, C> SpreadsheetValueAppendCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6923,13 +6889,15 @@ impl<'a, C> SpreadsheetValueAppendCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7235,25 +7203,15 @@ impl<'a, C> SpreadsheetValueBatchClearCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7261,13 +7219,15 @@ impl<'a, C> SpreadsheetValueBatchClearCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7528,25 +7488,15 @@ impl<'a, C> SpreadsheetValueBatchClearByDataFilterCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7554,13 +7504,15 @@ impl<'a, C> SpreadsheetValueBatchClearByDataFilterCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7822,25 +7774,15 @@ impl<'a, C> SpreadsheetValueBatchGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7848,13 +7790,15 @@ impl<'a, C> SpreadsheetValueBatchGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8135,25 +8079,15 @@ impl<'a, C> SpreadsheetValueBatchGetByDataFilterCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8161,13 +8095,15 @@ impl<'a, C> SpreadsheetValueBatchGetByDataFilterCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8428,25 +8364,15 @@ impl<'a, C> SpreadsheetValueBatchUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8454,13 +8380,15 @@ impl<'a, C> SpreadsheetValueBatchUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8721,25 +8649,15 @@ impl<'a, C> SpreadsheetValueBatchUpdateByDataFilterCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8747,13 +8665,15 @@ impl<'a, C> SpreadsheetValueBatchUpdateByDataFilterCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9016,25 +8936,15 @@ impl<'a, C> SpreadsheetValueClearCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9042,13 +8952,15 @@ impl<'a, C> SpreadsheetValueClearCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9315,25 +9227,15 @@ impl<'a, C> SpreadsheetValueGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9341,13 +9243,15 @@ impl<'a, C> SpreadsheetValueGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9652,25 +9556,15 @@ impl<'a, C> SpreadsheetValueUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9678,13 +9572,15 @@ impl<'a, C> SpreadsheetValueUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9983,25 +9879,15 @@ impl<'a, C> SpreadsheetBatchUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10009,13 +9895,15 @@ impl<'a, C> SpreadsheetBatchUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10253,25 +10141,15 @@ impl<'a, C> SpreadsheetCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10279,13 +10157,15 @@ impl<'a, C> SpreadsheetCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10527,25 +10407,15 @@ impl<'a, C> SpreadsheetGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10553,13 +10423,15 @@ impl<'a, C> SpreadsheetGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10826,25 +10698,15 @@ impl<'a, C> SpreadsheetGetByDataFilterCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10852,13 +10714,15 @@ impl<'a, C> SpreadsheetGetByDataFilterCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/sheets4/src/client.rs b/gen/sheets4/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/sheets4/src/client.rs +++ b/gen/sheets4/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/siteverification1/src/api.rs b/gen/siteverification1/src/api.rs index cf1f374af5..791fe3ae3f 100644 --- a/gen/siteverification1/src/api.rs +++ b/gen/siteverification1/src/api.rs @@ -599,25 +599,15 @@ impl<'a, C> WebResourceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -625,11 +615,11 @@ impl<'a, C> WebResourceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -850,25 +840,15 @@ impl<'a, C> WebResourceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -876,13 +856,15 @@ impl<'a, C> WebResourceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1107,25 +1089,15 @@ impl<'a, C> WebResourceGetTokenCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1133,13 +1105,15 @@ impl<'a, C> WebResourceGetTokenCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1365,25 +1339,15 @@ impl<'a, C> WebResourceInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1391,13 +1355,15 @@ impl<'a, C> WebResourceInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1610,25 +1576,15 @@ impl<'a, C> WebResourceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1636,13 +1592,15 @@ impl<'a, C> WebResourceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1880,25 +1838,15 @@ impl<'a, C> WebResourcePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1906,13 +1854,15 @@ impl<'a, C> WebResourcePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2169,25 +2119,15 @@ impl<'a, C> WebResourceUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2195,13 +2135,15 @@ impl<'a, C> WebResourceUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/siteverification1/src/client.rs b/gen/siteverification1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/siteverification1/src/client.rs +++ b/gen/siteverification1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/smartdevicemanagement1-cli/src/main.rs b/gen/smartdevicemanagement1-cli/src/main.rs index 7b81ff0880..9490a99518 100644 --- a/gen/smartdevicemanagement1-cli/src/main.rs +++ b/gen/smartdevicemanagement1-cli/src/main.rs @@ -207,7 +207,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -321,7 +321,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/smartdevicemanagement1/src/api.rs b/gen/smartdevicemanagement1/src/api.rs index 14c75d6995..7ee938e71e 100644 --- a/gen/smartdevicemanagement1/src/api.rs +++ b/gen/smartdevicemanagement1/src/api.rs @@ -688,25 +688,15 @@ impl<'a, C> EnterpriseDeviceExecuteCommandCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -714,13 +704,15 @@ impl<'a, C> EnterpriseDeviceExecuteCommandCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -964,25 +956,15 @@ impl<'a, C> EnterpriseDeviceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -990,13 +972,15 @@ impl<'a, C> EnterpriseDeviceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1246,25 +1230,15 @@ impl<'a, C> EnterpriseDeviceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1272,13 +1246,15 @@ impl<'a, C> EnterpriseDeviceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1534,25 +1510,15 @@ impl<'a, C> EnterpriseStructureRoomGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1560,13 +1526,15 @@ impl<'a, C> EnterpriseStructureRoomGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1811,25 +1779,15 @@ impl<'a, C> EnterpriseStructureRoomListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1837,13 +1795,15 @@ impl<'a, C> EnterpriseStructureRoomListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2092,25 +2052,15 @@ impl<'a, C> EnterpriseStructureGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2118,13 +2068,15 @@ impl<'a, C> EnterpriseStructureGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2374,25 +2326,15 @@ impl<'a, C> EnterpriseStructureListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2400,13 +2342,15 @@ impl<'a, C> EnterpriseStructureListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/smartdevicemanagement1/src/client.rs b/gen/smartdevicemanagement1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/smartdevicemanagement1/src/client.rs +++ b/gen/smartdevicemanagement1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/sourcerepo1/src/api.rs b/gen/sourcerepo1/src/api.rs index 1be06ab483..3fad7b048f 100644 --- a/gen/sourcerepo1/src/api.rs +++ b/gen/sourcerepo1/src/api.rs @@ -979,25 +979,15 @@ impl<'a, C> ProjectRepoCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1005,13 +995,15 @@ impl<'a, C> ProjectRepoCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1255,25 +1247,15 @@ impl<'a, C> ProjectRepoDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1281,13 +1263,15 @@ impl<'a, C> ProjectRepoDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1522,25 +1506,15 @@ impl<'a, C> ProjectRepoGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1548,13 +1522,15 @@ impl<'a, C> ProjectRepoGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1794,25 +1770,15 @@ impl<'a, C> ProjectRepoGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1820,13 +1786,15 @@ impl<'a, C> ProjectRepoGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2078,25 +2046,15 @@ impl<'a, C> ProjectRepoListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2104,13 +2062,15 @@ impl<'a, C> ProjectRepoListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2380,25 +2340,15 @@ impl<'a, C> ProjectRepoPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2406,13 +2356,15 @@ impl<'a, C> ProjectRepoPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2677,25 +2629,15 @@ impl<'a, C> ProjectRepoSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2703,13 +2645,15 @@ impl<'a, C> ProjectRepoSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2974,25 +2918,15 @@ impl<'a, C> ProjectRepoSyncCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3000,13 +2934,15 @@ impl<'a, C> ProjectRepoSyncCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3271,25 +3207,15 @@ impl<'a, C> ProjectRepoTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3297,13 +3223,15 @@ impl<'a, C> ProjectRepoTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3547,25 +3475,15 @@ impl<'a, C> ProjectGetConfigCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3573,13 +3491,15 @@ impl<'a, C> ProjectGetConfigCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3835,25 +3755,15 @@ impl<'a, C> ProjectUpdateConfigCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3861,13 +3771,15 @@ impl<'a, C> ProjectUpdateConfigCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/sourcerepo1/src/client.rs b/gen/sourcerepo1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/sourcerepo1/src/client.rs +++ b/gen/sourcerepo1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/spectrum1_explorer/src/api.rs b/gen/spectrum1_explorer/src/api.rs index 46ce900a26..15f6cad18c 100644 --- a/gen/spectrum1_explorer/src/api.rs +++ b/gen/spectrum1_explorer/src/api.rs @@ -1261,25 +1261,15 @@ impl<'a, C> PawGetSpectrumCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1287,13 +1277,15 @@ impl<'a, C> PawGetSpectrumCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1486,25 +1478,15 @@ impl<'a, C> PawGetSpectrumBatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1512,13 +1494,15 @@ impl<'a, C> PawGetSpectrumBatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1711,25 +1695,15 @@ impl<'a, C> PawInitCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1737,13 +1711,15 @@ impl<'a, C> PawInitCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1936,25 +1912,15 @@ impl<'a, C> PawNotifySpectrumUseCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1962,13 +1928,15 @@ impl<'a, C> PawNotifySpectrumUseCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2161,25 +2129,15 @@ impl<'a, C> PawRegisterCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2187,13 +2145,15 @@ impl<'a, C> PawRegisterCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2386,25 +2346,15 @@ impl<'a, C> PawVerifyDeviceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2412,13 +2362,15 @@ impl<'a, C> PawVerifyDeviceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/spectrum1_explorer/src/client.rs b/gen/spectrum1_explorer/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/spectrum1_explorer/src/client.rs +++ b/gen/spectrum1_explorer/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/speech1-cli/src/main.rs b/gen/speech1-cli/src/main.rs index 2e4dfd2749..c9f07aa0cc 100644 --- a/gen/speech1-cli/src/main.rs +++ b/gen/speech1-cli/src/main.rs @@ -125,7 +125,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "name", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "name", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/speech1/src/api.rs b/gen/speech1/src/api.rs index 458bd5ded5..638c782db0 100644 --- a/gen/speech1/src/api.rs +++ b/gen/speech1/src/api.rs @@ -788,25 +788,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -814,13 +804,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1048,25 +1040,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1074,13 +1056,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1327,25 +1311,15 @@ impl<'a, C> SpeechLongrunningrecognizeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1353,13 +1327,15 @@ impl<'a, C> SpeechLongrunningrecognizeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1587,25 +1563,15 @@ impl<'a, C> SpeechRecognizeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1613,13 +1579,15 @@ impl<'a, C> SpeechRecognizeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/speech1/src/client.rs b/gen/speech1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/speech1/src/client.rs +++ b/gen/speech1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/speech1_beta1-cli/src/main.rs b/gen/speech1_beta1-cli/src/main.rs index 000ac8a2d5..61fdf2cef9 100644 --- a/gen/speech1_beta1-cli/src/main.rs +++ b/gen/speech1_beta1-cli/src/main.rs @@ -125,7 +125,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["name", "page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "name", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/speech1_beta1/src/api.rs b/gen/speech1_beta1/src/api.rs index 3fdd7df986..77f2c45fa8 100644 --- a/gen/speech1_beta1/src/api.rs +++ b/gen/speech1_beta1/src/api.rs @@ -813,25 +813,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -839,13 +829,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1100,25 +1092,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1126,13 +1108,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1366,25 +1350,15 @@ impl<'a, C> SpeechAsyncrecognizeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1392,13 +1366,15 @@ impl<'a, C> SpeechAsyncrecognizeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1627,25 +1603,15 @@ impl<'a, C> SpeechSyncrecognizeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1653,13 +1619,15 @@ impl<'a, C> SpeechSyncrecognizeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/speech1_beta1/src/client.rs b/gen/speech1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/speech1_beta1/src/client.rs +++ b/gen/speech1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/sql1_beta4/src/api.rs b/gen/sql1_beta4/src/api.rs index 1297fc0422..6204bf412e 100644 --- a/gen/sql1_beta4/src/api.rs +++ b/gen/sql1_beta4/src/api.rs @@ -3730,25 +3730,15 @@ impl<'a, C> BackupRunDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3756,13 +3746,15 @@ impl<'a, C> BackupRunDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4019,25 +4011,15 @@ impl<'a, C> BackupRunGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4045,13 +4027,15 @@ impl<'a, C> BackupRunGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4326,25 +4310,15 @@ impl<'a, C> BackupRunInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4352,13 +4326,15 @@ impl<'a, C> BackupRunInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4621,25 +4597,15 @@ impl<'a, C> BackupRunListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4647,13 +4613,15 @@ impl<'a, C> BackupRunListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4913,25 +4881,15 @@ impl<'a, C> DatabaseDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4939,13 +4897,15 @@ impl<'a, C> DatabaseDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5201,25 +5161,15 @@ impl<'a, C> DatabaseGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5227,13 +5177,15 @@ impl<'a, C> DatabaseGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5508,25 +5460,15 @@ impl<'a, C> DatabaseInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5534,13 +5476,15 @@ impl<'a, C> DatabaseInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5792,25 +5736,15 @@ impl<'a, C> DatabaseListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5818,13 +5752,15 @@ impl<'a, C> DatabaseListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6091,25 +6027,15 @@ impl<'a, C> DatabasePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6117,13 +6043,15 @@ impl<'a, C> DatabasePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6409,25 +6337,15 @@ impl<'a, C> DatabaseUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6435,13 +6353,15 @@ impl<'a, C> DatabaseUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6683,25 +6603,15 @@ impl<'a, C> FlagListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6709,13 +6619,15 @@ impl<'a, C> FlagListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6950,25 +6862,15 @@ impl<'a, C> InstanceAddServerCaCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6976,13 +6878,15 @@ impl<'a, C> InstanceAddServerCaCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7247,25 +7151,15 @@ impl<'a, C> InstanceCloneCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7273,13 +7167,15 @@ impl<'a, C> InstanceCloneCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7532,25 +7428,15 @@ impl<'a, C> InstanceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7558,13 +7444,15 @@ impl<'a, C> InstanceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7829,25 +7717,15 @@ impl<'a, C> InstanceDemoteMasterCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7855,13 +7733,15 @@ impl<'a, C> InstanceDemoteMasterCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8135,25 +8015,15 @@ impl<'a, C> InstanceExportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8161,13 +8031,15 @@ impl<'a, C> InstanceExportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8441,25 +8313,15 @@ impl<'a, C> InstanceFailoverCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8467,13 +8329,15 @@ impl<'a, C> InstanceFailoverCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8725,25 +8589,15 @@ impl<'a, C> InstanceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8751,13 +8605,15 @@ impl<'a, C> InstanceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9022,25 +8878,15 @@ impl<'a, C> InstanceImportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9048,13 +8894,15 @@ impl<'a, C> InstanceImportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9325,25 +9173,15 @@ impl<'a, C> InstanceInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9351,13 +9189,15 @@ impl<'a, C> InstanceInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9613,25 +9453,15 @@ impl<'a, C> InstanceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9639,13 +9469,15 @@ impl<'a, C> InstanceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9912,25 +9744,15 @@ impl<'a, C> InstanceListServerCaCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9938,13 +9760,15 @@ impl<'a, C> InstanceListServerCaCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10209,25 +10033,15 @@ impl<'a, C> InstancePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10235,13 +10049,15 @@ impl<'a, C> InstancePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10494,25 +10310,15 @@ impl<'a, C> InstancePromoteReplicaCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10520,13 +10326,15 @@ impl<'a, C> InstancePromoteReplicaCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10770,25 +10578,15 @@ impl<'a, C> InstanceResetSslConfigCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10796,13 +10594,15 @@ impl<'a, C> InstanceResetSslConfigCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11045,25 +10845,15 @@ impl<'a, C> InstanceRestartCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11071,13 +10861,15 @@ impl<'a, C> InstanceRestartCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11342,25 +11134,15 @@ impl<'a, C> InstanceRestoreBackupCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11368,13 +11150,15 @@ impl<'a, C> InstanceRestoreBackupCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11648,25 +11432,15 @@ impl<'a, C> InstanceRotateServerCaCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11674,13 +11448,15 @@ impl<'a, C> InstanceRotateServerCaCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11932,25 +11708,15 @@ impl<'a, C> InstanceStartReplicaCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11958,13 +11724,15 @@ impl<'a, C> InstanceStartReplicaCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12207,25 +11975,15 @@ impl<'a, C> InstanceStopReplicaCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12233,13 +11991,15 @@ impl<'a, C> InstanceStopReplicaCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12503,25 +12263,15 @@ impl<'a, C> InstanceTruncateLogCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12529,13 +12279,15 @@ impl<'a, C> InstanceTruncateLogCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12809,25 +12561,15 @@ impl<'a, C> InstanceUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12835,13 +12577,15 @@ impl<'a, C> InstanceUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13093,25 +12837,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13119,13 +12853,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13382,25 +13118,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13408,13 +13134,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13690,25 +13418,15 @@ impl<'a, C> ProjectInstanceRescheduleMaintenanceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13716,13 +13434,15 @@ impl<'a, C> ProjectInstanceRescheduleMaintenanceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13979,25 +13699,15 @@ impl<'a, C> ProjectInstanceStartExternalSyncCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14005,13 +13715,15 @@ impl<'a, C> ProjectInstanceStartExternalSyncCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14271,25 +13983,15 @@ impl<'a, C> ProjectInstanceVerifyExternalSyncSettingCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14297,13 +13999,15 @@ impl<'a, C> ProjectInstanceVerifyExternalSyncSettingCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14584,25 +14288,15 @@ impl<'a, C> SslCertCreateEphemeralCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14610,13 +14304,15 @@ impl<'a, C> SslCertCreateEphemeralCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14871,25 +14567,15 @@ impl<'a, C> SslCertDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14897,13 +14583,15 @@ impl<'a, C> SslCertDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15160,25 +14848,15 @@ impl<'a, C> SslCertGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15186,13 +14864,15 @@ impl<'a, C> SslCertGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15468,25 +15148,15 @@ impl<'a, C> SslCertInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15494,13 +15164,15 @@ impl<'a, C> SslCertInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15752,25 +15424,15 @@ impl<'a, C> SslCertListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15778,13 +15440,15 @@ impl<'a, C> SslCertListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16027,25 +15691,15 @@ impl<'a, C> TierListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16053,13 +15707,15 @@ impl<'a, C> TierListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16302,25 +15958,15 @@ impl<'a, C> UserDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16328,13 +15974,15 @@ impl<'a, C> UserDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16612,25 +16260,15 @@ impl<'a, C> UserInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16638,13 +16276,15 @@ impl<'a, C> UserInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16896,25 +16536,15 @@ impl<'a, C> UserListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16922,13 +16552,15 @@ impl<'a, C> UserListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17202,25 +16834,15 @@ impl<'a, C> UserUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17228,13 +16850,15 @@ impl<'a, C> UserUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/sql1_beta4/src/client.rs b/gen/sql1_beta4/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/sql1_beta4/src/client.rs +++ b/gen/sql1_beta4/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/sqladmin1_beta4-cli/src/main.rs b/gen/sqladmin1_beta4-cli/src/main.rs index d1a682e37a..b8a3429639 100644 --- a/gen/sqladmin1_beta4-cli/src/main.rs +++ b/gen/sqladmin1_beta4-cli/src/main.rs @@ -275,7 +275,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1633,7 +1633,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results", "filter"].iter().map(|v|*v)); + v.extend(["filter", "max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2695,7 +2695,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results", "instance"].iter().map(|v|*v)); + v.extend(["instance", "max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2899,7 +2899,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["verify-connection-only", "sync-mode"].iter().map(|v|*v)); + v.extend(["sync-mode", "verify-connection-only"].iter().map(|v|*v)); v } )); } } @@ -3337,7 +3337,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["name", "host"].iter().map(|v|*v)); + v.extend(["host", "name"].iter().map(|v|*v)); v } )); } } @@ -3584,7 +3584,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["name", "host"].iter().map(|v|*v)); + v.extend(["host", "name"].iter().map(|v|*v)); v } )); } } diff --git a/gen/sqladmin1_beta4/src/api.rs b/gen/sqladmin1_beta4/src/api.rs index 710bc3074f..90d84ccf56 100644 --- a/gen/sqladmin1_beta4/src/api.rs +++ b/gen/sqladmin1_beta4/src/api.rs @@ -3553,25 +3553,15 @@ impl<'a, C> BackupRunDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3579,13 +3569,15 @@ impl<'a, C> BackupRunDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3840,25 +3832,15 @@ impl<'a, C> BackupRunGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3866,13 +3848,15 @@ impl<'a, C> BackupRunGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4146,25 +4130,15 @@ impl<'a, C> BackupRunInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4172,13 +4146,15 @@ impl<'a, C> BackupRunInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4440,25 +4416,15 @@ impl<'a, C> BackupRunListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4466,13 +4432,15 @@ impl<'a, C> BackupRunListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4731,25 +4699,15 @@ impl<'a, C> DatabaseDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4757,13 +4715,15 @@ impl<'a, C> DatabaseDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5018,25 +4978,15 @@ impl<'a, C> DatabaseGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5044,13 +4994,15 @@ impl<'a, C> DatabaseGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5324,25 +5276,15 @@ impl<'a, C> DatabaseInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5350,13 +5292,15 @@ impl<'a, C> DatabaseInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5608,25 +5552,15 @@ impl<'a, C> DatabaseListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5634,13 +5568,15 @@ impl<'a, C> DatabaseListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5906,25 +5842,15 @@ impl<'a, C> DatabasePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5932,13 +5858,15 @@ impl<'a, C> DatabasePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6223,25 +6151,15 @@ impl<'a, C> DatabaseUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6249,13 +6167,15 @@ impl<'a, C> DatabaseUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6497,25 +6417,15 @@ impl<'a, C> FlagListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6523,13 +6433,15 @@ impl<'a, C> FlagListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6759,25 +6671,15 @@ impl<'a, C> InstanceAddServerCaCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6785,13 +6687,15 @@ impl<'a, C> InstanceAddServerCaCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7055,25 +6959,15 @@ impl<'a, C> InstanceCloneCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7081,13 +6975,15 @@ impl<'a, C> InstanceCloneCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7339,25 +7235,15 @@ impl<'a, C> InstanceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7365,13 +7251,15 @@ impl<'a, C> InstanceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7635,25 +7523,15 @@ impl<'a, C> InstanceDemoteMasterCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7661,13 +7539,15 @@ impl<'a, C> InstanceDemoteMasterCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7940,25 +7820,15 @@ impl<'a, C> InstanceExportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7966,13 +7836,15 @@ impl<'a, C> InstanceExportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8245,25 +8117,15 @@ impl<'a, C> InstanceFailoverCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8271,13 +8133,15 @@ impl<'a, C> InstanceFailoverCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8529,25 +8393,15 @@ impl<'a, C> InstanceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8555,13 +8409,15 @@ impl<'a, C> InstanceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8825,25 +8681,15 @@ impl<'a, C> InstanceImportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8851,13 +8697,15 @@ impl<'a, C> InstanceImportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9128,25 +8976,15 @@ impl<'a, C> InstanceInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9154,13 +8992,15 @@ impl<'a, C> InstanceInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9415,25 +9255,15 @@ impl<'a, C> InstanceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9441,13 +9271,15 @@ impl<'a, C> InstanceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9701,25 +9533,15 @@ impl<'a, C> InstanceListServerCaCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9727,13 +9549,15 @@ impl<'a, C> InstanceListServerCaCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9997,25 +9821,15 @@ impl<'a, C> InstancePatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10023,13 +9837,15 @@ impl<'a, C> InstancePatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10281,25 +10097,15 @@ impl<'a, C> InstancePromoteReplicaCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10307,13 +10113,15 @@ impl<'a, C> InstancePromoteReplicaCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10556,25 +10364,15 @@ impl<'a, C> InstanceResetSslConfigCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10582,13 +10380,15 @@ impl<'a, C> InstanceResetSslConfigCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10831,25 +10631,15 @@ impl<'a, C> InstanceRestartCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10857,13 +10647,15 @@ impl<'a, C> InstanceRestartCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11127,25 +10919,15 @@ impl<'a, C> InstanceRestoreBackupCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11153,13 +10935,15 @@ impl<'a, C> InstanceRestoreBackupCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11432,25 +11216,15 @@ impl<'a, C> InstanceRotateServerCaCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11458,13 +11232,15 @@ impl<'a, C> InstanceRotateServerCaCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11716,25 +11492,15 @@ impl<'a, C> InstanceStartReplicaCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11742,13 +11508,15 @@ impl<'a, C> InstanceStartReplicaCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11991,25 +11759,15 @@ impl<'a, C> InstanceStopReplicaCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12017,13 +11775,15 @@ impl<'a, C> InstanceStopReplicaCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12287,25 +12047,15 @@ impl<'a, C> InstanceTruncateLogCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12313,13 +12063,15 @@ impl<'a, C> InstanceTruncateLogCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12592,25 +12344,15 @@ impl<'a, C> InstanceUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12618,13 +12360,15 @@ impl<'a, C> InstanceUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12876,25 +12620,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12902,13 +12636,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13164,25 +12900,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13190,13 +12916,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13471,25 +13199,15 @@ impl<'a, C> ProjectInstanceRescheduleMaintenanceCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13497,13 +13215,15 @@ impl<'a, C> ProjectInstanceRescheduleMaintenanceCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13765,25 +13485,15 @@ impl<'a, C> ProjectInstanceStartExternalSyncCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13791,13 +13501,15 @@ impl<'a, C> ProjectInstanceStartExternalSyncCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14064,25 +13776,15 @@ impl<'a, C> ProjectInstanceVerifyExternalSyncSettingCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14090,13 +13792,15 @@ impl<'a, C> ProjectInstanceVerifyExternalSyncSettingCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14374,25 +14078,15 @@ impl<'a, C> SslCertCreateEphemeralCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14400,13 +14094,15 @@ impl<'a, C> SslCertCreateEphemeralCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14660,25 +14356,15 @@ impl<'a, C> SslCertDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14686,13 +14372,15 @@ impl<'a, C> SslCertDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14947,25 +14635,15 @@ impl<'a, C> SslCertGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14973,13 +14651,15 @@ impl<'a, C> SslCertGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15253,25 +14933,15 @@ impl<'a, C> SslCertInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15279,13 +14949,15 @@ impl<'a, C> SslCertInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15537,25 +15209,15 @@ impl<'a, C> SslCertListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15563,13 +15225,15 @@ impl<'a, C> SslCertListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15810,25 +15474,15 @@ impl<'a, C> TierListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15836,13 +15490,15 @@ impl<'a, C> TierListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16085,25 +15741,15 @@ impl<'a, C> UserDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16111,13 +15757,15 @@ impl<'a, C> UserDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16395,25 +16043,15 @@ impl<'a, C> UserInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16421,13 +16059,15 @@ impl<'a, C> UserInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16679,25 +16319,15 @@ impl<'a, C> UserListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16705,13 +16335,15 @@ impl<'a, C> UserListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16985,25 +16617,15 @@ impl<'a, C> UserUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17011,13 +16633,15 @@ impl<'a, C> UserUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/sqladmin1_beta4/src/client.rs b/gen/sqladmin1_beta4/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/sqladmin1_beta4/src/client.rs +++ b/gen/sqladmin1_beta4/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/storage1-cli/src/main.rs b/gen/storage1-cli/src/main.rs index 127e529ffb..f29c1e4e36 100644 --- a/gen/storage1-cli/src/main.rs +++ b/gen/storage1-cli/src/main.rs @@ -67,7 +67,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "provisional-user-project"].iter().map(|v|*v)); + v.extend(["provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -118,7 +118,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "provisional-user-project"].iter().map(|v|*v)); + v.extend(["provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -221,7 +221,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "provisional-user-project"].iter().map(|v|*v)); + v.extend(["provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -280,7 +280,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "provisional-user-project"].iter().map(|v|*v)); + v.extend(["provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -383,7 +383,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "provisional-user-project"].iter().map(|v|*v)); + v.extend(["provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -486,7 +486,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "provisional-user-project"].iter().map(|v|*v)); + v.extend(["provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -551,7 +551,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "provisional-user-project", "if-metageneration-match", "if-metageneration-not-match"].iter().map(|v|*v)); + v.extend(["if-metageneration-match", "if-metageneration-not-match", "provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -611,7 +611,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "if-metageneration-match", "projection", "provisional-user-project", "if-metageneration-not-match"].iter().map(|v|*v)); + v.extend(["if-metageneration-match", "if-metageneration-not-match", "projection", "provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -673,7 +673,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "provisional-user-project", "options-requested-policy-version"].iter().map(|v|*v)); + v.extend(["options-requested-policy-version", "provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -806,7 +806,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "projection", "predefined-acl", "provisional-user-project", "predefined-default-object-acl"].iter().map(|v|*v)); + v.extend(["predefined-acl", "predefined-default-object-acl", "projection", "provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -877,7 +877,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "page-token", "prefix", "projection", "max-results", "provisional-user-project"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "prefix", "projection", "provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -936,7 +936,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "provisional-user-project"].iter().map(|v|*v)); + v.extend(["provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -1075,7 +1075,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "if-metageneration-match", "projection", "predefined-acl", "provisional-user-project", "if-metageneration-not-match", "predefined-default-object-acl"].iter().map(|v|*v)); + v.extend(["if-metageneration-match", "if-metageneration-not-match", "predefined-acl", "predefined-default-object-acl", "projection", "provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -1170,7 +1170,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "provisional-user-project"].iter().map(|v|*v)); + v.extend(["provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -1229,7 +1229,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "provisional-user-project"].iter().map(|v|*v)); + v.extend(["provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -1368,7 +1368,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "if-metageneration-match", "projection", "predefined-acl", "provisional-user-project", "if-metageneration-not-match", "predefined-default-object-acl"].iter().map(|v|*v)); + v.extend(["if-metageneration-match", "if-metageneration-not-match", "predefined-acl", "predefined-default-object-acl", "projection", "provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -1513,7 +1513,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "provisional-user-project"].iter().map(|v|*v)); + v.extend(["provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -1564,7 +1564,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "provisional-user-project"].iter().map(|v|*v)); + v.extend(["provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -1669,7 +1669,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "provisional-user-project"].iter().map(|v|*v)); + v.extend(["provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -1734,7 +1734,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "provisional-user-project", "if-metageneration-match", "if-metageneration-not-match"].iter().map(|v|*v)); + v.extend(["if-metageneration-match", "if-metageneration-not-match", "provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -1839,7 +1839,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "provisional-user-project"].iter().map(|v|*v)); + v.extend(["provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -1944,7 +1944,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "provisional-user-project"].iter().map(|v|*v)); + v.extend(["provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -2003,7 +2003,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "provisional-user-project"].iter().map(|v|*v)); + v.extend(["provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -2054,7 +2054,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "provisional-user-project"].iter().map(|v|*v)); + v.extend(["provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -2154,7 +2154,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "provisional-user-project"].iter().map(|v|*v)); + v.extend(["provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -2213,7 +2213,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "provisional-user-project"].iter().map(|v|*v)); + v.extend(["provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -2275,7 +2275,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "provisional-user-project", "generation"].iter().map(|v|*v)); + v.extend(["generation", "provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -2329,7 +2329,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "provisional-user-project", "generation"].iter().map(|v|*v)); + v.extend(["generation", "provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -2437,7 +2437,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "provisional-user-project", "generation"].iter().map(|v|*v)); + v.extend(["generation", "provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -2499,7 +2499,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "provisional-user-project", "generation"].iter().map(|v|*v)); + v.extend(["generation", "provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -2607,7 +2607,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "provisional-user-project", "generation"].iter().map(|v|*v)); + v.extend(["generation", "provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -2715,7 +2715,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "provisional-user-project", "generation"].iter().map(|v|*v)); + v.extend(["generation", "provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -2852,7 +2852,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "kms-key-name", "if-generation-match", "if-metageneration-match", "destination-predefined-acl", "provisional-user-project"].iter().map(|v|*v)); + v.extend(["destination-predefined-acl", "if-generation-match", "if-metageneration-match", "kms-key-name", "provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -3012,7 +3012,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "if-metageneration-match", "if-source-metageneration-match", "if-generation-match", "projection", "destination-predefined-acl", "if-generation-not-match", "if-source-metageneration-not-match", "provisional-user-project", "if-metageneration-not-match", "source-generation", "if-source-generation-match", "if-source-generation-not-match", "destination-kms-key-name"].iter().map(|v|*v)); + v.extend(["destination-kms-key-name", "destination-predefined-acl", "if-generation-match", "if-generation-not-match", "if-metageneration-match", "if-metageneration-not-match", "if-source-generation-match", "if-source-generation-not-match", "if-source-metageneration-match", "if-source-metageneration-not-match", "projection", "provisional-user-project", "source-generation", "user-project"].iter().map(|v|*v)); v } )); } } @@ -3086,7 +3086,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "if-metageneration-match", "if-generation-match", "generation", "if-generation-not-match", "provisional-user-project", "if-metageneration-not-match"].iter().map(|v|*v)); + v.extend(["generation", "if-generation-match", "if-generation-not-match", "if-metageneration-match", "if-metageneration-not-match", "provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -3159,7 +3159,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "if-metageneration-match", "if-generation-match", "generation", "projection", "if-generation-not-match", "provisional-user-project", "if-metageneration-not-match"].iter().map(|v|*v)); + v.extend(["generation", "if-generation-match", "if-generation-not-match", "if-metageneration-match", "if-metageneration-not-match", "projection", "provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -3227,7 +3227,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "provisional-user-project", "generation"].iter().map(|v|*v)); + v.extend(["generation", "provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -3378,7 +3378,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "kms-key-name", "if-metageneration-match", "if-generation-match", "projection", "predefined-acl", "provisional-user-project", "if-generation-not-match", "if-metageneration-not-match", "name", "content-encoding"].iter().map(|v|*v)); + v.extend(["content-encoding", "if-generation-match", "if-generation-not-match", "if-metageneration-match", "if-metageneration-not-match", "kms-key-name", "name", "predefined-acl", "projection", "provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -3467,7 +3467,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["versions", "user-project", "page-token", "prefix", "delimiter", "projection", "max-results", "provisional-user-project", "end-offset", "start-offset", "include-trailing-delimiter"].iter().map(|v|*v)); + v.extend(["delimiter", "end-offset", "include-trailing-delimiter", "max-results", "page-token", "prefix", "projection", "provisional-user-project", "start-offset", "user-project", "versions"].iter().map(|v|*v)); v } )); } } @@ -3612,7 +3612,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "if-metageneration-match", "if-generation-match", "generation", "projection", "predefined-acl", "provisional-user-project", "if-generation-not-match", "if-metageneration-not-match"].iter().map(|v|*v)); + v.extend(["generation", "if-generation-match", "if-generation-not-match", "if-metageneration-match", "if-metageneration-not-match", "predefined-acl", "projection", "provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -3778,7 +3778,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "rewrite-token", "if-source-metageneration-match", "if-metageneration-match", "projection", "if-generation-match", "destination-predefined-acl", "if-generation-not-match", "provisional-user-project", "if-source-metageneration-not-match", "if-metageneration-not-match", "source-generation", "if-source-generation-match", "max-bytes-rewritten-per-call", "if-source-generation-not-match", "destination-kms-key-name"].iter().map(|v|*v)); + v.extend(["destination-kms-key-name", "destination-predefined-acl", "if-generation-match", "if-generation-not-match", "if-metageneration-match", "if-metageneration-not-match", "if-source-generation-match", "if-source-generation-not-match", "if-source-metageneration-match", "if-source-metageneration-not-match", "max-bytes-rewritten-per-call", "projection", "provisional-user-project", "rewrite-token", "source-generation", "user-project"].iter().map(|v|*v)); v } )); } } @@ -3876,7 +3876,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "provisional-user-project", "generation"].iter().map(|v|*v)); + v.extend(["generation", "provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -3938,7 +3938,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "provisional-user-project", "generation"].iter().map(|v|*v)); + v.extend(["generation", "provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -4083,7 +4083,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "if-metageneration-match", "if-generation-match", "generation", "projection", "predefined-acl", "provisional-user-project", "if-generation-not-match", "if-metageneration-not-match"].iter().map(|v|*v)); + v.extend(["generation", "if-generation-match", "if-generation-not-match", "if-metageneration-match", "if-metageneration-not-match", "predefined-acl", "projection", "provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } @@ -4211,7 +4211,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["versions", "user-project", "page-token", "prefix", "delimiter", "projection", "max-results", "provisional-user-project", "end-offset", "start-offset", "include-trailing-delimiter"].iter().map(|v|*v)); + v.extend(["delimiter", "end-offset", "include-trailing-delimiter", "max-results", "page-token", "prefix", "projection", "provisional-user-project", "start-offset", "user-project", "versions"].iter().map(|v|*v)); v } )); } } @@ -4439,7 +4439,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "page-token", "show-deleted-keys", "service-account-email", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "page-token", "service-account-email", "show-deleted-keys", "user-project"].iter().map(|v|*v)); v } )); } } @@ -4596,7 +4596,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["user-project", "provisional-user-project"].iter().map(|v|*v)); + v.extend(["provisional-user-project", "user-project"].iter().map(|v|*v)); v } )); } } diff --git a/gen/storage1/src/api.rs b/gen/storage1/src/api.rs index 53260f80c8..911bb2a32f 100644 --- a/gen/storage1/src/api.rs +++ b/gen/storage1/src/api.rs @@ -3146,25 +3146,15 @@ impl<'a, C> BucketAccessControlDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3172,11 +3162,11 @@ impl<'a, C> BucketAccessControlDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -3433,25 +3423,15 @@ impl<'a, C> BucketAccessControlGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3459,13 +3439,15 @@ impl<'a, C> BucketAccessControlGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3747,25 +3729,15 @@ impl<'a, C> BucketAccessControlInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3773,13 +3745,15 @@ impl<'a, C> BucketAccessControlInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4039,25 +4013,15 @@ impl<'a, C> BucketAccessControlListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4065,13 +4029,15 @@ impl<'a, C> BucketAccessControlListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4345,25 +4311,15 @@ impl<'a, C> BucketAccessControlPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4371,13 +4327,15 @@ impl<'a, C> BucketAccessControlPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4670,25 +4628,15 @@ impl<'a, C> BucketAccessControlUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4696,13 +4644,15 @@ impl<'a, C> BucketAccessControlUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4981,25 +4931,15 @@ impl<'a, C> BucketDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5007,11 +4947,11 @@ impl<'a, C> BucketDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -5285,25 +5225,15 @@ impl<'a, C> BucketGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5311,13 +5241,15 @@ impl<'a, C> BucketGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5594,25 +5526,15 @@ impl<'a, C> BucketGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5620,13 +5542,15 @@ impl<'a, C> BucketGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5899,25 +5823,15 @@ impl<'a, C> BucketInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5925,13 +5839,15 @@ impl<'a, C> BucketInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6211,25 +6127,15 @@ impl<'a, C> BucketListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6237,13 +6143,15 @@ impl<'a, C> BucketListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6524,25 +6432,15 @@ impl<'a, C> BucketLockRetentionPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6550,13 +6448,15 @@ impl<'a, C> BucketLockRetentionPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6863,25 +6763,15 @@ impl<'a, C> BucketPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6889,13 +6779,15 @@ impl<'a, C> BucketPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7211,25 +7103,15 @@ impl<'a, C> BucketSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7237,13 +7119,15 @@ impl<'a, C> BucketSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7509,25 +7393,15 @@ impl<'a, C> BucketTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7535,13 +7409,15 @@ impl<'a, C> BucketTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7849,25 +7725,15 @@ impl<'a, C> BucketUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7875,13 +7741,15 @@ impl<'a, C> BucketUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8163,25 +8031,15 @@ impl<'a, C> ChannelStopCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8189,11 +8047,11 @@ impl<'a, C> ChannelStopCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -8424,25 +8282,15 @@ impl<'a, C> DefaultObjectAccessControlDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8450,11 +8298,11 @@ impl<'a, C> DefaultObjectAccessControlDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -8711,25 +8559,15 @@ impl<'a, C> DefaultObjectAccessControlGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8737,13 +8575,15 @@ impl<'a, C> DefaultObjectAccessControlGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9025,25 +8865,15 @@ impl<'a, C> DefaultObjectAccessControlInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9051,13 +8881,15 @@ impl<'a, C> DefaultObjectAccessControlInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9327,25 +9159,15 @@ impl<'a, C> DefaultObjectAccessControlListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9353,13 +9175,15 @@ impl<'a, C> DefaultObjectAccessControlListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9647,25 +9471,15 @@ impl<'a, C> DefaultObjectAccessControlPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9673,13 +9487,15 @@ impl<'a, C> DefaultObjectAccessControlPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9972,25 +9788,15 @@ impl<'a, C> DefaultObjectAccessControlUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9998,13 +9804,15 @@ impl<'a, C> DefaultObjectAccessControlUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10275,25 +10083,15 @@ impl<'a, C> NotificationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10301,11 +10099,11 @@ impl<'a, C> NotificationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -10562,25 +10360,15 @@ impl<'a, C> NotificationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10588,13 +10376,15 @@ impl<'a, C> NotificationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10876,25 +10666,15 @@ impl<'a, C> NotificationInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10902,13 +10682,15 @@ impl<'a, C> NotificationInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11168,25 +10950,15 @@ impl<'a, C> NotificationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11194,13 +10966,15 @@ impl<'a, C> NotificationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11459,25 +11233,15 @@ impl<'a, C> ObjectAccessControlDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11485,11 +11249,11 @@ impl<'a, C> ObjectAccessControlDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -11770,25 +11534,15 @@ impl<'a, C> ObjectAccessControlGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11796,13 +11550,15 @@ impl<'a, C> ObjectAccessControlGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12108,25 +11864,15 @@ impl<'a, C> ObjectAccessControlInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12134,13 +11880,15 @@ impl<'a, C> ObjectAccessControlInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12424,25 +12172,15 @@ impl<'a, C> ObjectAccessControlListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12450,13 +12188,15 @@ impl<'a, C> ObjectAccessControlListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12754,25 +12494,15 @@ impl<'a, C> ObjectAccessControlPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12780,13 +12510,15 @@ impl<'a, C> ObjectAccessControlPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13103,25 +12835,15 @@ impl<'a, C> ObjectAccessControlUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13129,13 +12851,15 @@ impl<'a, C> ObjectAccessControlUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13465,25 +13189,15 @@ impl<'a, C> ObjectComposeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13491,13 +13205,15 @@ impl<'a, C> ObjectComposeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13882,25 +13598,15 @@ impl<'a, C> ObjectCopyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13908,13 +13614,15 @@ impl<'a, C> ObjectCopyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14314,25 +14022,15 @@ impl<'a, C> ObjectDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14340,11 +14038,11 @@ impl<'a, C> ObjectDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -14687,25 +14385,15 @@ impl<'a, C> ObjectGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14713,19 +14401,21 @@ impl<'a, C> ObjectGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = if enable_resource_parsing { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); } } - } else { (reconstructed_result, Default::default()) }; + } else { (res, Default::default()) }; dlg.finished(true); return Ok(result_value) @@ -15029,25 +14719,15 @@ impl<'a, C> ObjectGetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15055,13 +14735,15 @@ impl<'a, C> ObjectGetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15438,25 +15120,15 @@ impl<'a, C> ObjectInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15464,7 +15136,7 @@ impl<'a, C> ObjectInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -15474,7 +15146,7 @@ impl<'a, C> ObjectInsertCall<'a, C> where C: BorrowMut ObjectInsertCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15907,25 +15581,15 @@ impl<'a, C> ObjectListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15933,13 +15597,15 @@ impl<'a, C> ObjectListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16311,25 +15977,15 @@ impl<'a, C> ObjectPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16337,13 +15993,15 @@ impl<'a, C> ObjectPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16759,25 +16417,15 @@ impl<'a, C> ObjectRewriteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16785,13 +16433,15 @@ impl<'a, C> ObjectRewriteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17207,25 +16857,15 @@ impl<'a, C> ObjectSetIamPolicyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17233,13 +16873,15 @@ impl<'a, C> ObjectSetIamPolicyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17529,25 +17171,15 @@ impl<'a, C> ObjectTestIamPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17555,13 +17187,15 @@ impl<'a, C> ObjectTestIamPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17898,25 +17532,15 @@ impl<'a, C> ObjectUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17924,13 +17548,15 @@ impl<'a, C> ObjectUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18315,25 +17941,15 @@ impl<'a, C> ObjectWatchAllCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18341,13 +17957,15 @@ impl<'a, C> ObjectWatchAllCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18667,25 +18285,15 @@ impl<'a, C> ProjectHmacKeyCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18693,13 +18301,15 @@ impl<'a, C> ProjectHmacKeyCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18949,25 +18559,15 @@ impl<'a, C> ProjectHmacKeyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18975,11 +18575,11 @@ impl<'a, C> ProjectHmacKeyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -19224,25 +18824,15 @@ impl<'a, C> ProjectHmacKeyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19250,13 +18840,15 @@ impl<'a, C> ProjectHmacKeyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19525,25 +19117,15 @@ impl<'a, C> ProjectHmacKeyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19551,13 +19133,15 @@ impl<'a, C> ProjectHmacKeyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19847,25 +19431,15 @@ impl<'a, C> ProjectHmacKeyUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19873,13 +19447,15 @@ impl<'a, C> ProjectHmacKeyUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20142,25 +19718,15 @@ impl<'a, C> ProjectServiceAccountGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20168,13 +19734,15 @@ impl<'a, C> ProjectServiceAccountGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/storage1/src/client.rs b/gen/storage1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/storage1/src/client.rs +++ b/gen/storage1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/storagetransfer1-cli/src/main.rs b/gen/storagetransfer1-cli/src/main.rs index 37fe0fe7ec..af481c1175 100644 --- a/gen/storagetransfer1-cli/src/main.rs +++ b/gen/storagetransfer1-cli/src/main.rs @@ -303,7 +303,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -717,7 +717,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/storagetransfer1/src/api.rs b/gen/storagetransfer1/src/api.rs index 8bc82f3825..7f2c735c56 100644 --- a/gen/storagetransfer1/src/api.rs +++ b/gen/storagetransfer1/src/api.rs @@ -1320,25 +1320,15 @@ impl<'a, C> GoogleServiceAccountGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1346,13 +1336,15 @@ impl<'a, C> GoogleServiceAccountGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1581,25 +1573,15 @@ impl<'a, C> TransferJobCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1607,13 +1589,15 @@ impl<'a, C> TransferJobCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1849,25 +1833,15 @@ impl<'a, C> TransferJobGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1875,13 +1849,15 @@ impl<'a, C> TransferJobGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2111,25 +2087,15 @@ impl<'a, C> TransferJobListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2137,13 +2103,15 @@ impl<'a, C> TransferJobListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2413,25 +2381,15 @@ impl<'a, C> TransferJobPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2439,13 +2397,15 @@ impl<'a, C> TransferJobPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2710,25 +2670,15 @@ impl<'a, C> TransferJobRunCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2736,13 +2686,15 @@ impl<'a, C> TransferJobRunCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3007,25 +2959,15 @@ impl<'a, C> TransferOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3033,13 +2975,15 @@ impl<'a, C> TransferOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3283,25 +3227,15 @@ impl<'a, C> TransferOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3309,13 +3243,15 @@ impl<'a, C> TransferOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3562,25 +3498,15 @@ impl<'a, C> TransferOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3588,13 +3514,15 @@ impl<'a, C> TransferOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3874,25 +3802,15 @@ impl<'a, C> TransferOperationPauseCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3900,13 +3818,15 @@ impl<'a, C> TransferOperationPauseCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4171,25 +4091,15 @@ impl<'a, C> TransferOperationResumeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4197,13 +4107,15 @@ impl<'a, C> TransferOperationResumeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/storagetransfer1/src/client.rs b/gen/storagetransfer1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/storagetransfer1/src/client.rs +++ b/gen/storagetransfer1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/sts1/src/api.rs b/gen/sts1/src/api.rs index ae56aef85a..f10c9e6eb8 100644 --- a/gen/sts1/src/api.rs +++ b/gen/sts1/src/api.rs @@ -399,25 +399,15 @@ impl<'a, C> MethodTokenCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -425,13 +415,15 @@ impl<'a, C> MethodTokenCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/sts1/src/client.rs b/gen/sts1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/sts1/src/client.rs +++ b/gen/sts1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/surveys2-cli/src/main.rs b/gen/surveys2-cli/src/main.rs index ee395b1325..a83b03f9c9 100644 --- a/gen/surveys2-cli/src/main.rs +++ b/gen/surveys2-cli/src/main.rs @@ -372,7 +372,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-index", "token", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "start-index", "token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/surveys2/src/api.rs b/gen/surveys2/src/api.rs index 58e2549223..0d71d7da3b 100644 --- a/gen/surveys2/src/api.rs +++ b/gen/surveys2/src/api.rs @@ -993,25 +993,15 @@ impl<'a, C> ResultGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1019,19 +1009,21 @@ impl<'a, C> ResultGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = if enable_resource_parsing { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); } } - } else { (reconstructed_result, Default::default()) }; + } else { (res, Default::default()) }; dlg.finished(true); return Ok(result_value) @@ -1261,25 +1253,15 @@ impl<'a, C> SurveyDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1287,13 +1269,15 @@ impl<'a, C> SurveyDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1520,25 +1504,15 @@ impl<'a, C> SurveyGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1546,13 +1520,15 @@ impl<'a, C> SurveyGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1777,25 +1753,15 @@ impl<'a, C> SurveyInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1803,13 +1769,15 @@ impl<'a, C> SurveyInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2027,25 +1995,15 @@ impl<'a, C> SurveyListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2053,13 +2011,15 @@ impl<'a, C> SurveyListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2315,25 +2275,15 @@ impl<'a, C> SurveyStartCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2341,13 +2291,15 @@ impl<'a, C> SurveyStartCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2582,25 +2534,15 @@ impl<'a, C> SurveyStopCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2608,13 +2550,15 @@ impl<'a, C> SurveyStopCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2861,25 +2805,15 @@ impl<'a, C> SurveyUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2887,13 +2821,15 @@ impl<'a, C> SurveyUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/surveys2/src/client.rs b/gen/surveys2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/surveys2/src/client.rs +++ b/gen/surveys2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/tagmanager1-cli/src/main.rs b/gen/tagmanager1-cli/src/main.rs index 7c2b2e2eb3..0137f249e1 100644 --- a/gen/tagmanager1-cli/src/main.rs +++ b/gen/tagmanager1-cli/src/main.rs @@ -1076,7 +1076,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["variable-id", "trigger-id", "tag-id"].iter().map(|v|*v)); + v.extend(["tag-id", "trigger-id", "variable-id"].iter().map(|v|*v)); v } )); } } diff --git a/gen/tagmanager1/src/api.rs b/gen/tagmanager1/src/api.rs index 47323e6395..e642a12c0c 100644 --- a/gen/tagmanager1/src/api.rs +++ b/gen/tagmanager1/src/api.rs @@ -2411,25 +2411,15 @@ impl<'a, C> AccountContainerEnvironmentCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2437,13 +2427,15 @@ impl<'a, C> AccountContainerEnvironmentCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2696,25 +2688,15 @@ impl<'a, C> AccountContainerEnvironmentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2722,11 +2704,11 @@ impl<'a, C> AccountContainerEnvironmentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -2975,25 +2957,15 @@ impl<'a, C> AccountContainerEnvironmentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3001,13 +2973,15 @@ impl<'a, C> AccountContainerEnvironmentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3260,25 +3234,15 @@ impl<'a, C> AccountContainerEnvironmentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3286,13 +3250,15 @@ impl<'a, C> AccountContainerEnvironmentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3563,25 +3529,15 @@ impl<'a, C> AccountContainerEnvironmentUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3589,13 +3545,15 @@ impl<'a, C> AccountContainerEnvironmentUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3866,25 +3824,15 @@ impl<'a, C> AccountContainerFolderEntityListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3892,13 +3840,15 @@ impl<'a, C> AccountContainerFolderEntityListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4172,25 +4122,15 @@ impl<'a, C> AccountContainerFolderCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4198,13 +4138,15 @@ impl<'a, C> AccountContainerFolderCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4457,25 +4399,15 @@ impl<'a, C> AccountContainerFolderDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4483,11 +4415,11 @@ impl<'a, C> AccountContainerFolderDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -4736,25 +4668,15 @@ impl<'a, C> AccountContainerFolderGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4762,13 +4684,15 @@ impl<'a, C> AccountContainerFolderGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5021,25 +4945,15 @@ impl<'a, C> AccountContainerFolderListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5047,13 +4961,15 @@ impl<'a, C> AccountContainerFolderListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5324,25 +5240,15 @@ impl<'a, C> AccountContainerFolderUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5350,13 +5256,15 @@ impl<'a, C> AccountContainerFolderUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5668,25 +5576,15 @@ impl<'a, C> AccountContainerMoveFolderUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5694,11 +5592,11 @@ impl<'a, C> AccountContainerMoveFolderUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -6001,25 +5899,15 @@ impl<'a, C> AccountContainerReauthorizeEnvironmentUpdateCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6027,13 +5915,15 @@ impl<'a, C> AccountContainerReauthorizeEnvironmentUpdateCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6316,25 +6206,15 @@ impl<'a, C> AccountContainerTagCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6342,13 +6222,15 @@ impl<'a, C> AccountContainerTagCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6601,25 +6483,15 @@ impl<'a, C> AccountContainerTagDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6627,11 +6499,11 @@ impl<'a, C> AccountContainerTagDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -6880,25 +6752,15 @@ impl<'a, C> AccountContainerTagGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6906,13 +6768,15 @@ impl<'a, C> AccountContainerTagGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7165,25 +7029,15 @@ impl<'a, C> AccountContainerTagListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7191,13 +7045,15 @@ impl<'a, C> AccountContainerTagListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7468,25 +7324,15 @@ impl<'a, C> AccountContainerTagUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7494,13 +7340,15 @@ impl<'a, C> AccountContainerTagUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7790,25 +7638,15 @@ impl<'a, C> AccountContainerTriggerCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7816,13 +7654,15 @@ impl<'a, C> AccountContainerTriggerCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8075,25 +7915,15 @@ impl<'a, C> AccountContainerTriggerDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8101,11 +7931,11 @@ impl<'a, C> AccountContainerTriggerDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -8354,25 +8184,15 @@ impl<'a, C> AccountContainerTriggerGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8380,13 +8200,15 @@ impl<'a, C> AccountContainerTriggerGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8639,25 +8461,15 @@ impl<'a, C> AccountContainerTriggerListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8665,13 +8477,15 @@ impl<'a, C> AccountContainerTriggerListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8942,25 +8756,15 @@ impl<'a, C> AccountContainerTriggerUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8968,13 +8772,15 @@ impl<'a, C> AccountContainerTriggerUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9264,25 +9070,15 @@ impl<'a, C> AccountContainerVariableCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9290,13 +9086,15 @@ impl<'a, C> AccountContainerVariableCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9549,25 +9347,15 @@ impl<'a, C> AccountContainerVariableDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9575,11 +9363,11 @@ impl<'a, C> AccountContainerVariableDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -9828,25 +9616,15 @@ impl<'a, C> AccountContainerVariableGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9854,13 +9632,15 @@ impl<'a, C> AccountContainerVariableGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10113,25 +9893,15 @@ impl<'a, C> AccountContainerVariableListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10139,13 +9909,15 @@ impl<'a, C> AccountContainerVariableListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10416,25 +10188,15 @@ impl<'a, C> AccountContainerVariableUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10442,13 +10204,15 @@ impl<'a, C> AccountContainerVariableUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10738,25 +10502,15 @@ impl<'a, C> AccountContainerVersionCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10764,13 +10518,15 @@ impl<'a, C> AccountContainerVersionCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11023,25 +10779,15 @@ impl<'a, C> AccountContainerVersionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11049,11 +10795,11 @@ impl<'a, C> AccountContainerVersionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -11302,25 +11048,15 @@ impl<'a, C> AccountContainerVersionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11328,13 +11064,15 @@ impl<'a, C> AccountContainerVersionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11597,25 +11335,15 @@ impl<'a, C> AccountContainerVersionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11623,13 +11351,15 @@ impl<'a, C> AccountContainerVersionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11893,25 +11623,15 @@ impl<'a, C> AccountContainerVersionPublishCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11919,13 +11639,15 @@ impl<'a, C> AccountContainerVersionPublishCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12187,25 +11909,15 @@ impl<'a, C> AccountContainerVersionRestoreCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12213,13 +11925,15 @@ impl<'a, C> AccountContainerVersionRestoreCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12474,25 +12188,15 @@ impl<'a, C> AccountContainerVersionUndeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12500,13 +12204,15 @@ impl<'a, C> AccountContainerVersionUndeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12787,25 +12493,15 @@ impl<'a, C> AccountContainerVersionUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12813,13 +12509,15 @@ impl<'a, C> AccountContainerVersionUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13107,25 +12805,15 @@ impl<'a, C> AccountContainerCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13133,13 +12821,15 @@ impl<'a, C> AccountContainerCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13380,25 +13070,15 @@ impl<'a, C> AccountContainerDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13406,11 +13086,11 @@ impl<'a, C> AccountContainerDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -13647,25 +13327,15 @@ impl<'a, C> AccountContainerGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13673,13 +13343,15 @@ impl<'a, C> AccountContainerGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13920,25 +13592,15 @@ impl<'a, C> AccountContainerListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13946,13 +13608,15 @@ impl<'a, C> AccountContainerListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14211,25 +13875,15 @@ impl<'a, C> AccountContainerUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14237,13 +13891,15 @@ impl<'a, C> AccountContainerUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14521,25 +14177,15 @@ impl<'a, C> AccountPermissionCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14547,13 +14193,15 @@ impl<'a, C> AccountPermissionCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14794,25 +14442,15 @@ impl<'a, C> AccountPermissionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14820,11 +14458,11 @@ impl<'a, C> AccountPermissionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -15061,25 +14699,15 @@ impl<'a, C> AccountPermissionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15087,13 +14715,15 @@ impl<'a, C> AccountPermissionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15334,25 +14964,15 @@ impl<'a, C> AccountPermissionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15360,13 +14980,15 @@ impl<'a, C> AccountPermissionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15620,25 +15242,15 @@ impl<'a, C> AccountPermissionUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15646,13 +15258,15 @@ impl<'a, C> AccountPermissionUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15902,25 +15516,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15928,13 +15532,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16142,25 +15748,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16168,13 +15764,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16421,25 +16019,15 @@ impl<'a, C> AccountUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16447,13 +16035,15 @@ impl<'a, C> AccountUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/tagmanager1/src/client.rs b/gen/tagmanager1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/tagmanager1/src/client.rs +++ b/gen/tagmanager1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/tagmanager2-cli/src/main.rs b/gen/tagmanager2-cli/src/main.rs index 574f5a78fe..132cbe8ac5 100644 --- a/gen/tagmanager2-cli/src/main.rs +++ b/gen/tagmanager2-cli/src/main.rs @@ -916,7 +916,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "include-deleted"].iter().map(|v|*v)); + v.extend(["include-deleted", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2177,7 +2177,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["trigger-id", "tag-id", "variable-id"].iter().map(|v|*v)); + v.extend(["tag-id", "trigger-id", "variable-id"].iter().map(|v|*v)); v } )); } } diff --git a/gen/tagmanager2/src/api.rs b/gen/tagmanager2/src/api.rs index 6f51047168..31278baf46 100644 --- a/gen/tagmanager2/src/api.rs +++ b/gen/tagmanager2/src/api.rs @@ -3582,25 +3582,15 @@ impl<'a, C> AccountContainerEnvironmentCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3608,13 +3598,15 @@ impl<'a, C> AccountContainerEnvironmentCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3857,25 +3849,15 @@ impl<'a, C> AccountContainerEnvironmentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3883,11 +3865,11 @@ impl<'a, C> AccountContainerEnvironmentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -4116,25 +4098,15 @@ impl<'a, C> AccountContainerEnvironmentGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4142,13 +4114,15 @@ impl<'a, C> AccountContainerEnvironmentGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4388,25 +4362,15 @@ impl<'a, C> AccountContainerEnvironmentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4414,13 +4378,15 @@ impl<'a, C> AccountContainerEnvironmentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4683,25 +4649,15 @@ impl<'a, C> AccountContainerEnvironmentReauthorizeCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4709,13 +4665,15 @@ impl<'a, C> AccountContainerEnvironmentReauthorizeCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4985,25 +4943,15 @@ impl<'a, C> AccountContainerEnvironmentUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5011,13 +4959,15 @@ impl<'a, C> AccountContainerEnvironmentUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5268,25 +5218,15 @@ impl<'a, C> AccountContainerVersionHeaderLatestCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5294,13 +5234,15 @@ impl<'a, C> AccountContainerVersionHeaderLatestCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5545,25 +5487,15 @@ impl<'a, C> AccountContainerVersionHeaderListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5571,13 +5503,15 @@ impl<'a, C> AccountContainerVersionHeaderListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5825,25 +5759,15 @@ impl<'a, C> AccountContainerVersionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5851,11 +5775,11 @@ impl<'a, C> AccountContainerVersionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -6089,25 +6013,15 @@ impl<'a, C> AccountContainerVersionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6115,13 +6029,15 @@ impl<'a, C> AccountContainerVersionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6363,25 +6279,15 @@ impl<'a, C> AccountContainerVersionLiveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6389,13 +6295,15 @@ impl<'a, C> AccountContainerVersionLiveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6635,25 +6543,15 @@ impl<'a, C> AccountContainerVersionPublishCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6661,13 +6559,15 @@ impl<'a, C> AccountContainerVersionPublishCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6909,25 +6809,15 @@ impl<'a, C> AccountContainerVersionSetLatestCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6935,13 +6825,15 @@ impl<'a, C> AccountContainerVersionSetLatestCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7176,25 +7068,15 @@ impl<'a, C> AccountContainerVersionUndeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7202,13 +7084,15 @@ impl<'a, C> AccountContainerVersionUndeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7469,25 +7353,15 @@ impl<'a, C> AccountContainerVersionUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7495,13 +7369,15 @@ impl<'a, C> AccountContainerVersionUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7759,25 +7635,15 @@ impl<'a, C> AccountContainerWorkspaceBuiltInVariableCreateCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7785,13 +7651,15 @@ impl<'a, C> AccountContainerWorkspaceBuiltInVariableCreateCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8040,25 +7908,15 @@ impl<'a, C> AccountContainerWorkspaceBuiltInVariableDeleteCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8066,11 +7924,11 @@ impl<'a, C> AccountContainerWorkspaceBuiltInVariableDeleteCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -8312,25 +8170,15 @@ impl<'a, C> AccountContainerWorkspaceBuiltInVariableListCall<'a, C> where C: Bor return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8338,13 +8186,15 @@ impl<'a, C> AccountContainerWorkspaceBuiltInVariableListCall<'a, C> where C: Bor } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8591,25 +8441,15 @@ impl<'a, C> AccountContainerWorkspaceBuiltInVariableRevertCall<'a, C> where C: B return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8617,13 +8457,15 @@ impl<'a, C> AccountContainerWorkspaceBuiltInVariableRevertCall<'a, C> where C: B } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8886,25 +8728,15 @@ impl<'a, C> AccountContainerWorkspaceFolderCreateCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8912,13 +8744,15 @@ impl<'a, C> AccountContainerWorkspaceFolderCreateCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9161,25 +8995,15 @@ impl<'a, C> AccountContainerWorkspaceFolderDeleteCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9187,11 +9011,11 @@ impl<'a, C> AccountContainerWorkspaceFolderDeleteCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -9425,25 +9249,15 @@ impl<'a, C> AccountContainerWorkspaceFolderEntityCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9451,13 +9265,15 @@ impl<'a, C> AccountContainerWorkspaceFolderEntityCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9699,25 +9515,15 @@ impl<'a, C> AccountContainerWorkspaceFolderGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9725,13 +9531,15 @@ impl<'a, C> AccountContainerWorkspaceFolderGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9971,25 +9779,15 @@ impl<'a, C> AccountContainerWorkspaceFolderListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9997,13 +9795,15 @@ impl<'a, C> AccountContainerWorkspaceFolderListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10286,25 +10086,15 @@ impl<'a, C> AccountContainerWorkspaceFolderMoveEntitiesToFolderCall<'a, C> where return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10312,11 +10102,11 @@ impl<'a, C> AccountContainerWorkspaceFolderMoveEntitiesToFolderCall<'a, C> where } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -10583,25 +10373,15 @@ impl<'a, C> AccountContainerWorkspaceFolderRevertCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10609,13 +10389,15 @@ impl<'a, C> AccountContainerWorkspaceFolderRevertCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10883,25 +10665,15 @@ impl<'a, C> AccountContainerWorkspaceFolderUpdateCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10909,13 +10681,15 @@ impl<'a, C> AccountContainerWorkspaceFolderUpdateCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11187,25 +10961,15 @@ impl<'a, C> AccountContainerWorkspaceTagCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11213,13 +10977,15 @@ impl<'a, C> AccountContainerWorkspaceTagCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11462,25 +11228,15 @@ impl<'a, C> AccountContainerWorkspaceTagDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11488,11 +11244,11 @@ impl<'a, C> AccountContainerWorkspaceTagDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -11721,25 +11477,15 @@ impl<'a, C> AccountContainerWorkspaceTagGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11747,13 +11493,15 @@ impl<'a, C> AccountContainerWorkspaceTagGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11993,25 +11741,15 @@ impl<'a, C> AccountContainerWorkspaceTagListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12019,13 +11757,15 @@ impl<'a, C> AccountContainerWorkspaceTagListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12272,25 +12012,15 @@ impl<'a, C> AccountContainerWorkspaceTagRevertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12298,13 +12028,15 @@ impl<'a, C> AccountContainerWorkspaceTagRevertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12572,25 +12304,15 @@ impl<'a, C> AccountContainerWorkspaceTagUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12598,13 +12320,15 @@ impl<'a, C> AccountContainerWorkspaceTagUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12876,25 +12600,15 @@ impl<'a, C> AccountContainerWorkspaceTemplateCreateCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12902,13 +12616,15 @@ impl<'a, C> AccountContainerWorkspaceTemplateCreateCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13151,25 +12867,15 @@ impl<'a, C> AccountContainerWorkspaceTemplateDeleteCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13177,11 +12883,11 @@ impl<'a, C> AccountContainerWorkspaceTemplateDeleteCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -13410,25 +13116,15 @@ impl<'a, C> AccountContainerWorkspaceTemplateGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13436,13 +13132,15 @@ impl<'a, C> AccountContainerWorkspaceTemplateGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13682,25 +13380,15 @@ impl<'a, C> AccountContainerWorkspaceTemplateListCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13708,13 +13396,15 @@ impl<'a, C> AccountContainerWorkspaceTemplateListCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13961,25 +13651,15 @@ impl<'a, C> AccountContainerWorkspaceTemplateRevertCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13987,13 +13667,15 @@ impl<'a, C> AccountContainerWorkspaceTemplateRevertCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14261,25 +13943,15 @@ impl<'a, C> AccountContainerWorkspaceTemplateUpdateCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14287,13 +13959,15 @@ impl<'a, C> AccountContainerWorkspaceTemplateUpdateCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14565,25 +14239,15 @@ impl<'a, C> AccountContainerWorkspaceTriggerCreateCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14591,13 +14255,15 @@ impl<'a, C> AccountContainerWorkspaceTriggerCreateCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14840,25 +14506,15 @@ impl<'a, C> AccountContainerWorkspaceTriggerDeleteCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14866,11 +14522,11 @@ impl<'a, C> AccountContainerWorkspaceTriggerDeleteCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -15099,25 +14755,15 @@ impl<'a, C> AccountContainerWorkspaceTriggerGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15125,13 +14771,15 @@ impl<'a, C> AccountContainerWorkspaceTriggerGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15371,25 +15019,15 @@ impl<'a, C> AccountContainerWorkspaceTriggerListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15397,13 +15035,15 @@ impl<'a, C> AccountContainerWorkspaceTriggerListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15650,25 +15290,15 @@ impl<'a, C> AccountContainerWorkspaceTriggerRevertCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15676,13 +15306,15 @@ impl<'a, C> AccountContainerWorkspaceTriggerRevertCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15950,25 +15582,15 @@ impl<'a, C> AccountContainerWorkspaceTriggerUpdateCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15976,13 +15598,15 @@ impl<'a, C> AccountContainerWorkspaceTriggerUpdateCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16254,25 +15878,15 @@ impl<'a, C> AccountContainerWorkspaceVariableCreateCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16280,13 +15894,15 @@ impl<'a, C> AccountContainerWorkspaceVariableCreateCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16529,25 +16145,15 @@ impl<'a, C> AccountContainerWorkspaceVariableDeleteCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16555,11 +16161,11 @@ impl<'a, C> AccountContainerWorkspaceVariableDeleteCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -16788,25 +16394,15 @@ impl<'a, C> AccountContainerWorkspaceVariableGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16814,13 +16410,15 @@ impl<'a, C> AccountContainerWorkspaceVariableGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17060,25 +16658,15 @@ impl<'a, C> AccountContainerWorkspaceVariableListCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17086,13 +16674,15 @@ impl<'a, C> AccountContainerWorkspaceVariableListCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17339,25 +16929,15 @@ impl<'a, C> AccountContainerWorkspaceVariableRevertCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17365,13 +16945,15 @@ impl<'a, C> AccountContainerWorkspaceVariableRevertCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17639,25 +17221,15 @@ impl<'a, C> AccountContainerWorkspaceVariableUpdateCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17665,13 +17237,15 @@ impl<'a, C> AccountContainerWorkspaceVariableUpdateCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17943,25 +17517,15 @@ impl<'a, C> AccountContainerWorkspaceZoneCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17969,13 +17533,15 @@ impl<'a, C> AccountContainerWorkspaceZoneCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18218,25 +17784,15 @@ impl<'a, C> AccountContainerWorkspaceZoneDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18244,11 +17800,11 @@ impl<'a, C> AccountContainerWorkspaceZoneDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -18477,25 +18033,15 @@ impl<'a, C> AccountContainerWorkspaceZoneGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18503,13 +18049,15 @@ impl<'a, C> AccountContainerWorkspaceZoneGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18749,25 +18297,15 @@ impl<'a, C> AccountContainerWorkspaceZoneListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18775,13 +18313,15 @@ impl<'a, C> AccountContainerWorkspaceZoneListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19028,25 +18568,15 @@ impl<'a, C> AccountContainerWorkspaceZoneRevertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19054,13 +18584,15 @@ impl<'a, C> AccountContainerWorkspaceZoneRevertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19328,25 +18860,15 @@ impl<'a, C> AccountContainerWorkspaceZoneUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19354,13 +18876,15 @@ impl<'a, C> AccountContainerWorkspaceZoneUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19632,25 +19156,15 @@ impl<'a, C> AccountContainerWorkspaceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19658,13 +19172,15 @@ impl<'a, C> AccountContainerWorkspaceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19929,25 +19445,15 @@ impl<'a, C> AccountContainerWorkspaceCreateVersionCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19955,13 +19461,15 @@ impl<'a, C> AccountContainerWorkspaceCreateVersionCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20204,25 +19712,15 @@ impl<'a, C> AccountContainerWorkspaceDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20230,11 +19728,11 @@ impl<'a, C> AccountContainerWorkspaceDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -20463,25 +19961,15 @@ impl<'a, C> AccountContainerWorkspaceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20489,13 +19977,15 @@ impl<'a, C> AccountContainerWorkspaceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20730,25 +20220,15 @@ impl<'a, C> AccountContainerWorkspaceGetStatuCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20756,13 +20236,15 @@ impl<'a, C> AccountContainerWorkspaceGetStatuCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21002,25 +20484,15 @@ impl<'a, C> AccountContainerWorkspaceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21028,13 +20500,15 @@ impl<'a, C> AccountContainerWorkspaceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21276,25 +20750,15 @@ impl<'a, C> AccountContainerWorkspaceQuickPreviewCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21302,13 +20766,15 @@ impl<'a, C> AccountContainerWorkspaceQuickPreviewCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21568,25 +21034,15 @@ impl<'a, C> AccountContainerWorkspaceResolveConflictCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21594,11 +21050,11 @@ impl<'a, C> AccountContainerWorkspaceResolveConflictCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -21843,25 +21299,15 @@ impl<'a, C> AccountContainerWorkspaceSyncCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21869,13 +21315,15 @@ impl<'a, C> AccountContainerWorkspaceSyncCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22136,25 +21584,15 @@ impl<'a, C> AccountContainerWorkspaceUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22162,13 +21600,15 @@ impl<'a, C> AccountContainerWorkspaceUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22440,25 +21880,15 @@ impl<'a, C> AccountContainerCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22466,13 +21896,15 @@ impl<'a, C> AccountContainerCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22715,25 +22147,15 @@ impl<'a, C> AccountContainerDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22741,11 +22163,11 @@ impl<'a, C> AccountContainerDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -22974,25 +22396,15 @@ impl<'a, C> AccountContainerGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23000,13 +22412,15 @@ impl<'a, C> AccountContainerGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23246,25 +22660,15 @@ impl<'a, C> AccountContainerListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23272,13 +22676,15 @@ impl<'a, C> AccountContainerListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23546,25 +22952,15 @@ impl<'a, C> AccountContainerUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23572,13 +22968,15 @@ impl<'a, C> AccountContainerUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23850,25 +23248,15 @@ impl<'a, C> AccountUserPermissionCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23876,13 +23264,15 @@ impl<'a, C> AccountUserPermissionCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24125,25 +23515,15 @@ impl<'a, C> AccountUserPermissionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24151,11 +23531,11 @@ impl<'a, C> AccountUserPermissionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -24384,25 +23764,15 @@ impl<'a, C> AccountUserPermissionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24410,13 +23780,15 @@ impl<'a, C> AccountUserPermissionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24656,25 +24028,15 @@ impl<'a, C> AccountUserPermissionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24682,13 +24044,15 @@ impl<'a, C> AccountUserPermissionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24951,25 +24315,15 @@ impl<'a, C> AccountUserPermissionUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24977,13 +24331,15 @@ impl<'a, C> AccountUserPermissionUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25227,25 +24583,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25253,13 +24599,15 @@ impl<'a, C> AccountGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25472,25 +24820,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25498,13 +24836,15 @@ impl<'a, C> AccountListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25762,25 +25102,15 @@ impl<'a, C> AccountUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25788,13 +25118,15 @@ impl<'a, C> AccountUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/tagmanager2/src/client.rs b/gen/tagmanager2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/tagmanager2/src/client.rs +++ b/gen/tagmanager2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/taskqueue1_beta2/src/api.rs b/gen/taskqueue1_beta2/src/api.rs index 9a33ba17c9..8117e28e3b 100644 --- a/gen/taskqueue1_beta2/src/api.rs +++ b/gen/taskqueue1_beta2/src/api.rs @@ -744,25 +744,15 @@ impl<'a, C> TaskqueueGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -770,13 +760,15 @@ impl<'a, C> TaskqueueGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1023,25 +1015,15 @@ impl<'a, C> TaskDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1049,11 +1031,11 @@ impl<'a, C> TaskDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -1298,25 +1280,15 @@ impl<'a, C> TaskGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1324,13 +1296,15 @@ impl<'a, C> TaskGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1600,25 +1574,15 @@ impl<'a, C> TaskInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1626,13 +1590,15 @@ impl<'a, C> TaskInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1894,25 +1860,15 @@ impl<'a, C> TaskLeaseCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1920,13 +1876,15 @@ impl<'a, C> TaskLeaseCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2199,25 +2157,15 @@ impl<'a, C> TaskListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2225,13 +2173,15 @@ impl<'a, C> TaskListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2495,25 +2445,15 @@ impl<'a, C> TaskPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2521,13 +2461,15 @@ impl<'a, C> TaskPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2818,25 +2760,15 @@ impl<'a, C> TaskUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2844,13 +2776,15 @@ impl<'a, C> TaskUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/taskqueue1_beta2/src/client.rs b/gen/taskqueue1_beta2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/taskqueue1_beta2/src/client.rs +++ b/gen/taskqueue1_beta2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/tasks1-cli/src/main.rs b/gen/tasks1-cli/src/main.rs index 63504a9045..67f290cc27 100644 --- a/gen/tasks1-cli/src/main.rs +++ b/gen/tasks1-cli/src/main.rs @@ -761,7 +761,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-results", "show-hidden", "updated-min", "completed-max", "page-token", "show-completed", "show-deleted", "due-min", "completed-min", "due-max"].iter().map(|v|*v)); + v.extend(["completed-max", "completed-min", "due-max", "due-min", "max-results", "page-token", "show-completed", "show-deleted", "show-hidden", "updated-min"].iter().map(|v|*v)); v } )); } } diff --git a/gen/tasks1/src/api.rs b/gen/tasks1/src/api.rs index a507d4cfdf..6792ccfa8e 100644 --- a/gen/tasks1/src/api.rs +++ b/gen/tasks1/src/api.rs @@ -838,25 +838,15 @@ impl<'a, C> TasklistDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -864,11 +854,11 @@ impl<'a, C> TasklistDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -1093,25 +1083,15 @@ impl<'a, C> TasklistGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1119,13 +1099,15 @@ impl<'a, C> TasklistGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1354,25 +1336,15 @@ impl<'a, C> TasklistInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1380,13 +1352,15 @@ impl<'a, C> TasklistInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1603,25 +1577,15 @@ impl<'a, C> TasklistListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1629,13 +1593,15 @@ impl<'a, C> TasklistListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1891,25 +1857,15 @@ impl<'a, C> TasklistPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1917,13 +1873,15 @@ impl<'a, C> TasklistPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2184,25 +2142,15 @@ impl<'a, C> TasklistUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2210,13 +2158,15 @@ impl<'a, C> TasklistUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2455,25 +2405,15 @@ impl<'a, C> TaskClearCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2481,11 +2421,11 @@ impl<'a, C> TaskClearCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -2711,25 +2651,15 @@ impl<'a, C> TaskDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2737,11 +2667,11 @@ impl<'a, C> TaskDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -2978,25 +2908,15 @@ impl<'a, C> TaskGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3004,13 +2924,15 @@ impl<'a, C> TaskGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3282,25 +3204,15 @@ impl<'a, C> TaskInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3308,13 +3220,15 @@ impl<'a, C> TaskInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3618,25 +3532,15 @@ impl<'a, C> TaskListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3644,13 +3548,15 @@ impl<'a, C> TaskListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3963,25 +3869,15 @@ impl<'a, C> TaskMoveCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3989,13 +3885,15 @@ impl<'a, C> TaskMoveCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4273,25 +4171,15 @@ impl<'a, C> TaskPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4299,13 +4187,15 @@ impl<'a, C> TaskPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4578,25 +4468,15 @@ impl<'a, C> TaskUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4604,13 +4484,15 @@ impl<'a, C> TaskUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/tasks1/src/client.rs b/gen/tasks1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/tasks1/src/client.rs +++ b/gen/tasks1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/testing1/src/api.rs b/gen/testing1/src/api.rs index cfc872157f..564ea5ddfa 100644 --- a/gen/testing1/src/api.rs +++ b/gen/testing1/src/api.rs @@ -1996,25 +1996,15 @@ impl<'a, C> ApplicationDetailServiceGetApkDetailCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2022,13 +2012,15 @@ impl<'a, C> ApplicationDetailServiceGetApkDetailCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2260,25 +2252,15 @@ impl<'a, C> ProjectTestMatriceCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2286,13 +2268,15 @@ impl<'a, C> ProjectTestMatriceCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2559,25 +2543,15 @@ impl<'a, C> ProjectTestMatriceCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2585,13 +2559,15 @@ impl<'a, C> ProjectTestMatriceCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2840,25 +2816,15 @@ impl<'a, C> ProjectTestMatriceGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2866,13 +2832,15 @@ impl<'a, C> ProjectTestMatriceGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3118,25 +3086,15 @@ impl<'a, C> TestEnvironmentCatalogGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3144,13 +3102,15 @@ impl<'a, C> TestEnvironmentCatalogGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/testing1/src/client.rs b/gen/testing1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/testing1/src/client.rs +++ b/gen/testing1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/texttospeech1/src/api.rs b/gen/texttospeech1/src/api.rs index 11fc323a88..039c7d4941 100644 --- a/gen/texttospeech1/src/api.rs +++ b/gen/texttospeech1/src/api.rs @@ -575,25 +575,15 @@ impl<'a, C> TextSynthesizeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -601,13 +591,15 @@ impl<'a, C> TextSynthesizeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -819,25 +811,15 @@ impl<'a, C> VoiceListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -845,13 +827,15 @@ impl<'a, C> VoiceListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/texttospeech1/src/client.rs b/gen/texttospeech1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/texttospeech1/src/client.rs +++ b/gen/texttospeech1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/tpu1-cli/src/main.rs b/gen/tpu1-cli/src/main.rs index 3287b14dbe..04bfd3cf72 100644 --- a/gen/tpu1-cli/src/main.rs +++ b/gen/tpu1-cli/src/main.rs @@ -125,7 +125,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -239,7 +239,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -507,7 +507,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -978,7 +978,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1095,7 +1095,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size", "order-by"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/tpu1/src/api.rs b/gen/tpu1/src/api.rs index ff5ea74ad3..4a235916d8 100644 --- a/gen/tpu1/src/api.rs +++ b/gen/tpu1/src/api.rs @@ -1088,25 +1088,15 @@ impl<'a, C> ProjectLocationAcceleratorTypeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1114,13 +1104,15 @@ impl<'a, C> ProjectLocationAcceleratorTypeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1375,25 +1367,15 @@ impl<'a, C> ProjectLocationAcceleratorTypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1401,13 +1383,15 @@ impl<'a, C> ProjectLocationAcceleratorTypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1696,25 +1680,15 @@ impl<'a, C> ProjectLocationNodeCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1722,13 +1696,15 @@ impl<'a, C> ProjectLocationNodeCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1979,25 +1955,15 @@ impl<'a, C> ProjectLocationNodeDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2005,13 +1971,15 @@ impl<'a, C> ProjectLocationNodeDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2246,25 +2214,15 @@ impl<'a, C> ProjectLocationNodeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2272,13 +2230,15 @@ impl<'a, C> ProjectLocationNodeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2523,25 +2483,15 @@ impl<'a, C> ProjectLocationNodeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2549,13 +2499,15 @@ impl<'a, C> ProjectLocationNodeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2825,25 +2777,15 @@ impl<'a, C> ProjectLocationNodeReimageCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2851,13 +2793,15 @@ impl<'a, C> ProjectLocationNodeReimageCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3122,25 +3066,15 @@ impl<'a, C> ProjectLocationNodeStartCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3148,13 +3082,15 @@ impl<'a, C> ProjectLocationNodeStartCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3419,25 +3355,15 @@ impl<'a, C> ProjectLocationNodeStopCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3445,13 +3371,15 @@ impl<'a, C> ProjectLocationNodeStopCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3695,25 +3623,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3721,13 +3639,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3962,25 +3882,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3988,13 +3898,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4229,25 +4141,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4255,13 +4157,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4511,25 +4415,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4537,13 +4431,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4799,25 +4695,15 @@ impl<'a, C> ProjectLocationTensorflowVersionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4825,13 +4711,15 @@ impl<'a, C> ProjectLocationTensorflowVersionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5086,25 +4974,15 @@ impl<'a, C> ProjectLocationTensorflowVersionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5112,13 +4990,15 @@ impl<'a, C> ProjectLocationTensorflowVersionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5381,25 +5261,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5407,13 +5277,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5663,25 +5535,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5689,13 +5551,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/tpu1/src/client.rs b/gen/tpu1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/tpu1/src/client.rs +++ b/gen/tpu1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/tpu1_alpha1-cli/src/main.rs b/gen/tpu1_alpha1-cli/src/main.rs index 3c355bed62..8298582a32 100644 --- a/gen/tpu1_alpha1-cli/src/main.rs +++ b/gen/tpu1_alpha1-cli/src/main.rs @@ -125,7 +125,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "order-by", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -239,7 +239,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -978,7 +978,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1095,7 +1095,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "order-by", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/tpu1_alpha1/src/api.rs b/gen/tpu1_alpha1/src/api.rs index 4e3fb50241..10dbd80388 100644 --- a/gen/tpu1_alpha1/src/api.rs +++ b/gen/tpu1_alpha1/src/api.rs @@ -1088,25 +1088,15 @@ impl<'a, C> ProjectLocationAcceleratorTypeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1114,13 +1104,15 @@ impl<'a, C> ProjectLocationAcceleratorTypeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1375,25 +1367,15 @@ impl<'a, C> ProjectLocationAcceleratorTypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1401,13 +1383,15 @@ impl<'a, C> ProjectLocationAcceleratorTypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1696,25 +1680,15 @@ impl<'a, C> ProjectLocationNodeCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1722,13 +1696,15 @@ impl<'a, C> ProjectLocationNodeCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1979,25 +1955,15 @@ impl<'a, C> ProjectLocationNodeDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2005,13 +1971,15 @@ impl<'a, C> ProjectLocationNodeDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2246,25 +2214,15 @@ impl<'a, C> ProjectLocationNodeGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2272,13 +2230,15 @@ impl<'a, C> ProjectLocationNodeGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2523,25 +2483,15 @@ impl<'a, C> ProjectLocationNodeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2549,13 +2499,15 @@ impl<'a, C> ProjectLocationNodeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2825,25 +2777,15 @@ impl<'a, C> ProjectLocationNodeReimageCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2851,13 +2793,15 @@ impl<'a, C> ProjectLocationNodeReimageCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3122,25 +3066,15 @@ impl<'a, C> ProjectLocationNodeStartCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3148,13 +3082,15 @@ impl<'a, C> ProjectLocationNodeStartCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3419,25 +3355,15 @@ impl<'a, C> ProjectLocationNodeStopCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3445,13 +3371,15 @@ impl<'a, C> ProjectLocationNodeStopCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3695,25 +3623,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3721,13 +3639,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3962,25 +3882,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3988,13 +3898,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4229,25 +4141,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4255,13 +4157,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4511,25 +4415,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4537,13 +4431,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4799,25 +4695,15 @@ impl<'a, C> ProjectLocationTensorflowVersionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4825,13 +4711,15 @@ impl<'a, C> ProjectLocationTensorflowVersionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5086,25 +4974,15 @@ impl<'a, C> ProjectLocationTensorflowVersionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5112,13 +4990,15 @@ impl<'a, C> ProjectLocationTensorflowVersionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5381,25 +5261,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5407,13 +5277,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5663,25 +5535,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5689,13 +5551,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/tpu1_alpha1/src/client.rs b/gen/tpu1_alpha1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/tpu1_alpha1/src/client.rs +++ b/gen/tpu1_alpha1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/transcoder1_beta1/src/api.rs b/gen/transcoder1_beta1/src/api.rs index c27b9357ad..50bcf8a775 100644 --- a/gen/transcoder1_beta1/src/api.rs +++ b/gen/transcoder1_beta1/src/api.rs @@ -1474,25 +1474,15 @@ impl<'a, C> ProjectLocationJobTemplateCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1500,13 +1490,15 @@ impl<'a, C> ProjectLocationJobTemplateCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1757,25 +1749,15 @@ impl<'a, C> ProjectLocationJobTemplateDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1783,13 +1765,15 @@ impl<'a, C> ProjectLocationJobTemplateDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2024,25 +2008,15 @@ impl<'a, C> ProjectLocationJobTemplateGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2050,13 +2024,15 @@ impl<'a, C> ProjectLocationJobTemplateGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2301,25 +2277,15 @@ impl<'a, C> ProjectLocationJobTemplateListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2327,13 +2293,15 @@ impl<'a, C> ProjectLocationJobTemplateListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2603,25 +2571,15 @@ impl<'a, C> ProjectLocationJobCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2629,13 +2587,15 @@ impl<'a, C> ProjectLocationJobCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2879,25 +2839,15 @@ impl<'a, C> ProjectLocationJobDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2905,13 +2855,15 @@ impl<'a, C> ProjectLocationJobDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3146,25 +3098,15 @@ impl<'a, C> ProjectLocationJobGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3172,13 +3114,15 @@ impl<'a, C> ProjectLocationJobGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3423,25 +3367,15 @@ impl<'a, C> ProjectLocationJobListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3449,13 +3383,15 @@ impl<'a, C> ProjectLocationJobListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/transcoder1_beta1/src/client.rs b/gen/transcoder1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/transcoder1_beta1/src/client.rs +++ b/gen/transcoder1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/translate2-cli/src/main.rs b/gen/translate2-cli/src/main.rs index 2ca32a5fdf..fedc37c8a9 100644 --- a/gen/translate2-cli/src/main.rs +++ b/gen/translate2-cli/src/main.rs @@ -204,7 +204,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["target", "model"].iter().map(|v|*v)); + v.extend(["model", "target"].iter().map(|v|*v)); v } )); } } @@ -269,7 +269,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["source", "format", "cid", "model"].iter().map(|v|*v)); + v.extend(["cid", "format", "model", "source"].iter().map(|v|*v)); v } )); } } diff --git a/gen/translate2/src/api.rs b/gen/translate2/src/api.rs index 16987c8c7f..b497f6ef61 100644 --- a/gen/translate2/src/api.rs +++ b/gen/translate2/src/api.rs @@ -730,25 +730,15 @@ impl<'a, C> DetectionDetectCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -756,13 +746,15 @@ impl<'a, C> DetectionDetectCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -977,25 +969,15 @@ impl<'a, C> DetectionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1003,13 +985,15 @@ impl<'a, C> DetectionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1231,25 +1215,15 @@ impl<'a, C> LanguageListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1257,13 +1231,15 @@ impl<'a, C> LanguageListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1508,25 +1484,15 @@ impl<'a, C> TranslationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1534,13 +1500,15 @@ impl<'a, C> TranslationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1818,25 +1786,15 @@ impl<'a, C> TranslationTranslateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1844,13 +1802,15 @@ impl<'a, C> TranslationTranslateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/translate2/src/client.rs b/gen/translate2/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/translate2/src/client.rs +++ b/gen/translate2/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/translate3-cli/src/main.rs b/gen/translate3-cli/src/main.rs index 3c78ca07bd..42f2b64920 100644 --- a/gen/translate3-cli/src/main.rs +++ b/gen/translate3-cli/src/main.rs @@ -701,7 +701,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -763,7 +763,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1013,7 +1013,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/translate3/src/api.rs b/gen/translate3/src/api.rs index cd738f949c..ad6cdc616e 100644 --- a/gen/translate3/src/api.rs +++ b/gen/translate3/src/api.rs @@ -1282,25 +1282,15 @@ impl<'a, C> ProjectLocationGlossaryCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1308,13 +1298,15 @@ impl<'a, C> ProjectLocationGlossaryCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1558,25 +1550,15 @@ impl<'a, C> ProjectLocationGlossaryDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1584,13 +1566,15 @@ impl<'a, C> ProjectLocationGlossaryDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1825,25 +1809,15 @@ impl<'a, C> ProjectLocationGlossaryGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1851,13 +1825,15 @@ impl<'a, C> ProjectLocationGlossaryGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2107,25 +2083,15 @@ impl<'a, C> ProjectLocationGlossaryListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2133,13 +2099,15 @@ impl<'a, C> ProjectLocationGlossaryListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2416,25 +2384,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2442,13 +2400,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2692,25 +2652,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2718,13 +2668,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2959,25 +2911,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2985,13 +2927,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3241,25 +3185,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3267,13 +3201,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3550,25 +3486,15 @@ impl<'a, C> ProjectLocationOperationWaitCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3576,13 +3502,15 @@ impl<'a, C> ProjectLocationOperationWaitCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3847,25 +3775,15 @@ impl<'a, C> ProjectLocationBatchTranslateTextCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3873,13 +3791,15 @@ impl<'a, C> ProjectLocationBatchTranslateTextCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4144,25 +4064,15 @@ impl<'a, C> ProjectLocationDetectLanguageCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4170,13 +4080,15 @@ impl<'a, C> ProjectLocationDetectLanguageCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4420,25 +4332,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4446,13 +4348,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4697,25 +4601,15 @@ impl<'a, C> ProjectLocationGetSupportedLanguageCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4723,13 +4617,15 @@ impl<'a, C> ProjectLocationGetSupportedLanguageCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4993,25 +4889,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5019,13 +4905,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5302,25 +5190,15 @@ impl<'a, C> ProjectLocationTranslateTextCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5328,13 +5206,15 @@ impl<'a, C> ProjectLocationTranslateTextCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5599,25 +5479,15 @@ impl<'a, C> ProjectDetectLanguageCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5625,13 +5495,15 @@ impl<'a, C> ProjectDetectLanguageCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5885,25 +5757,15 @@ impl<'a, C> ProjectGetSupportedLanguageCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5911,13 +5773,15 @@ impl<'a, C> ProjectGetSupportedLanguageCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6187,25 +6051,15 @@ impl<'a, C> ProjectTranslateTextCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6213,13 +6067,15 @@ impl<'a, C> ProjectTranslateTextCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/translate3/src/client.rs b/gen/translate3/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/translate3/src/client.rs +++ b/gen/translate3/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/urlshortener1/src/api.rs b/gen/urlshortener1/src/api.rs index 6afb63e684..ed8c82ba40 100644 --- a/gen/urlshortener1/src/api.rs +++ b/gen/urlshortener1/src/api.rs @@ -508,25 +508,15 @@ impl<'a, C> UrlGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -534,13 +524,15 @@ impl<'a, C> UrlGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -772,25 +764,15 @@ impl<'a, C> UrlInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -798,13 +780,15 @@ impl<'a, C> UrlInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1017,25 +1001,15 @@ impl<'a, C> UrlListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1043,13 +1017,15 @@ impl<'a, C> UrlListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/urlshortener1/src/client.rs b/gen/urlshortener1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/urlshortener1/src/client.rs +++ b/gen/urlshortener1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/vault1-cli/src/main.rs b/gen/vault1-cli/src/main.rs index 8ea21cabb0..15fad03ee8 100644 --- a/gen/vault1-cli/src/main.rs +++ b/gen/vault1-cli/src/main.rs @@ -707,7 +707,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1312,7 +1312,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "view", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "view"].iter().map(|v|*v)); v } )); } } @@ -1562,7 +1562,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "state", "view", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "state", "view"].iter().map(|v|*v)); v } )); } } @@ -2001,7 +2001,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -2417,7 +2417,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "filter", "page-size"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/vault1/src/api.rs b/gen/vault1/src/api.rs index 601fda3aac..fcfade8bae 100644 --- a/gen/vault1/src/api.rs +++ b/gen/vault1/src/api.rs @@ -2202,25 +2202,15 @@ impl<'a, C> MatterExportCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2228,13 +2218,15 @@ impl<'a, C> MatterExportCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2476,25 +2468,15 @@ impl<'a, C> MatterExportDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2502,13 +2484,15 @@ impl<'a, C> MatterExportDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2751,25 +2735,15 @@ impl<'a, C> MatterExportGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2777,13 +2751,15 @@ impl<'a, C> MatterExportGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3034,25 +3010,15 @@ impl<'a, C> MatterExportListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3060,13 +3026,15 @@ impl<'a, C> MatterExportListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3334,25 +3302,15 @@ impl<'a, C> MatterHoldAccountCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3360,13 +3318,15 @@ impl<'a, C> MatterHoldAccountCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3620,25 +3580,15 @@ impl<'a, C> MatterHoldAccountDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3646,13 +3596,15 @@ impl<'a, C> MatterHoldAccountDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3905,25 +3857,15 @@ impl<'a, C> MatterHoldAccountListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3931,13 +3873,15 @@ impl<'a, C> MatterHoldAccountListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4201,25 +4145,15 @@ impl<'a, C> MatterHoldAddHeldAccountCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4227,13 +4161,15 @@ impl<'a, C> MatterHoldAddHeldAccountCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4504,25 +4440,15 @@ impl<'a, C> MatterHoldCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4530,13 +4456,15 @@ impl<'a, C> MatterHoldCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4778,25 +4706,15 @@ impl<'a, C> MatterHoldDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4804,13 +4722,15 @@ impl<'a, C> MatterHoldDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5058,25 +4978,15 @@ impl<'a, C> MatterHoldGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5084,13 +4994,15 @@ impl<'a, C> MatterHoldGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5353,25 +5265,15 @@ impl<'a, C> MatterHoldListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5379,13 +5281,15 @@ impl<'a, C> MatterHoldListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5660,25 +5564,15 @@ impl<'a, C> MatterHoldRemoveHeldAccountCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5686,13 +5580,15 @@ impl<'a, C> MatterHoldRemoveHeldAccountCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5965,25 +5861,15 @@ impl<'a, C> MatterHoldUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5991,13 +5877,15 @@ impl<'a, C> MatterHoldUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6268,25 +6156,15 @@ impl<'a, C> MatterSavedQueryCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6294,13 +6172,15 @@ impl<'a, C> MatterSavedQueryCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6542,25 +6422,15 @@ impl<'a, C> MatterSavedQueryDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6568,13 +6438,15 @@ impl<'a, C> MatterSavedQueryDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6817,25 +6689,15 @@ impl<'a, C> MatterSavedQueryGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6843,13 +6705,15 @@ impl<'a, C> MatterSavedQueryGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7100,25 +6964,15 @@ impl<'a, C> MatterSavedQueryListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7126,13 +6980,15 @@ impl<'a, C> MatterSavedQueryListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7398,25 +7254,15 @@ impl<'a, C> MatterAddPermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7424,13 +7270,15 @@ impl<'a, C> MatterAddPermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7691,25 +7539,15 @@ impl<'a, C> MatterCloseCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7717,13 +7555,15 @@ impl<'a, C> MatterCloseCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7984,25 +7824,15 @@ impl<'a, C> MatterCountCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8010,13 +7840,15 @@ impl<'a, C> MatterCountCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8254,25 +8086,15 @@ impl<'a, C> MatterCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8280,13 +8102,15 @@ impl<'a, C> MatterCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8516,25 +8340,15 @@ impl<'a, C> MatterDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8542,13 +8356,15 @@ impl<'a, C> MatterDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8784,25 +8600,15 @@ impl<'a, C> MatterGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8810,13 +8616,15 @@ impl<'a, C> MatterGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9051,25 +8859,15 @@ impl<'a, C> MatterListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9077,13 +8875,15 @@ impl<'a, C> MatterListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9353,25 +9153,15 @@ impl<'a, C> MatterRemovePermissionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9379,13 +9169,15 @@ impl<'a, C> MatterRemovePermissionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9646,25 +9438,15 @@ impl<'a, C> MatterReopenCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9672,13 +9454,15 @@ impl<'a, C> MatterReopenCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9939,25 +9723,15 @@ impl<'a, C> MatterUndeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9965,13 +9739,15 @@ impl<'a, C> MatterUndeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10232,25 +10008,15 @@ impl<'a, C> MatterUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10258,13 +10024,15 @@ impl<'a, C> MatterUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10521,25 +10289,15 @@ impl<'a, C> OperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10547,13 +10305,15 @@ impl<'a, C> OperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10766,25 +10526,15 @@ impl<'a, C> OperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10792,13 +10542,15 @@ impl<'a, C> OperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11010,25 +10762,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11036,13 +10778,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11284,25 +11028,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11310,13 +11044,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/vault1/src/client.rs b/gen/vault1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/vault1/src/client.rs +++ b/gen/vault1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/vectortile1-cli/src/main.rs b/gen/vectortile1-cli/src/main.rs index b8ce875d28..590aa3fd55 100644 --- a/gen/vectortile1-cli/src/main.rs +++ b/gen/vectortile1-cli/src/main.rs @@ -112,7 +112,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["enable-detailed-highway-types", "enable-private-roads", "client-info-user-id", "client-info-operating-system", "region-code", "enable-political-features", "enable-modeled-volumes", "enable-feature-names", "client-info-api-client", "client-info-device-model", "language-code", "client-tile-version-id", "enable-unclipped-buildings", "client-info-platform", "client-info-application-id", "always-include-building-footprints", "client-info-application-version"].iter().map(|v|*v)); + v.extend(["always-include-building-footprints", "client-info-api-client", "client-info-application-id", "client-info-application-version", "client-info-device-model", "client-info-operating-system", "client-info-platform", "client-info-user-id", "client-tile-version-id", "enable-detailed-highway-types", "enable-feature-names", "enable-modeled-volumes", "enable-political-features", "enable-private-roads", "enable-unclipped-buildings", "language-code", "region-code"].iter().map(|v|*v)); v } )); } } @@ -195,7 +195,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["client-info-user-id", "client-info-operating-system", "altitude-precision-centimeters", "client-info-api-client", "client-info-device-model", "client-info-application-version", "client-info-platform", "client-info-application-id", "terrain-formats", "min-elevation-resolution-cells", "max-elevation-resolution-cells"].iter().map(|v|*v)); + v.extend(["altitude-precision-centimeters", "client-info-api-client", "client-info-application-id", "client-info-application-version", "client-info-device-model", "client-info-operating-system", "client-info-platform", "client-info-user-id", "max-elevation-resolution-cells", "min-elevation-resolution-cells", "terrain-formats"].iter().map(|v|*v)); v } )); } } diff --git a/gen/vectortile1/src/api.rs b/gen/vectortile1/src/api.rs index daf7ed7197..e50657743d 100644 --- a/gen/vectortile1/src/api.rs +++ b/gen/vectortile1/src/api.rs @@ -927,25 +927,15 @@ impl<'a, C> FeaturetileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -953,13 +943,15 @@ impl<'a, C> FeaturetileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1339,25 +1331,15 @@ impl<'a, C> TerraintileGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1365,13 +1347,15 @@ impl<'a, C> TerraintileGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/vectortile1/src/client.rs b/gen/vectortile1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/vectortile1/src/client.rs +++ b/gen/vectortile1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/verifiedaccess1/src/api.rs b/gen/verifiedaccess1/src/api.rs index f9d6359265..a73024771e 100644 --- a/gen/verifiedaccess1/src/api.rs +++ b/gen/verifiedaccess1/src/api.rs @@ -490,25 +490,15 @@ impl<'a, C> ChallengeCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -516,13 +506,15 @@ impl<'a, C> ChallengeCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -750,25 +742,15 @@ impl<'a, C> ChallengeVerifyCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -776,13 +758,15 @@ impl<'a, C> ChallengeVerifyCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/verifiedaccess1/src/client.rs b/gen/verifiedaccess1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/verifiedaccess1/src/client.rs +++ b/gen/verifiedaccess1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/videointelligence1-cli/src/main.rs b/gen/videointelligence1-cli/src/main.rs index 6d18c2dbb7..3def53aeff 100644 --- a/gen/videointelligence1-cli/src/main.rs +++ b/gen/videointelligence1-cli/src/main.rs @@ -414,7 +414,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/videointelligence1/src/api.rs b/gen/videointelligence1/src/api.rs index b148439d70..73194d09b2 100644 --- a/gen/videointelligence1/src/api.rs +++ b/gen/videointelligence1/src/api.rs @@ -950,25 +950,15 @@ impl<'a, C> OperationProjectLocationOperationCancelCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -976,13 +966,15 @@ impl<'a, C> OperationProjectLocationOperationCancelCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1217,25 +1209,15 @@ impl<'a, C> OperationProjectLocationOperationDeleteCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1243,13 +1225,15 @@ impl<'a, C> OperationProjectLocationOperationDeleteCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1484,25 +1468,15 @@ impl<'a, C> OperationProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1510,13 +1484,15 @@ impl<'a, C> OperationProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1772,25 +1748,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1798,13 +1764,15 @@ impl<'a, C> ProjectLocationOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2048,25 +2016,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2074,13 +2032,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2315,25 +2275,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2341,13 +2291,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2597,25 +2549,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2623,13 +2565,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2879,25 +2823,15 @@ impl<'a, C> VideoAnnotateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2905,13 +2839,15 @@ impl<'a, C> VideoAnnotateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/videointelligence1/src/client.rs b/gen/videointelligence1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/videointelligence1/src/client.rs +++ b/gen/videointelligence1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/videointelligence1_beta1/src/api.rs b/gen/videointelligence1_beta1/src/api.rs index d04381cd1d..dc130ac085 100644 --- a/gen/videointelligence1_beta1/src/api.rs +++ b/gen/videointelligence1_beta1/src/api.rs @@ -592,25 +592,15 @@ impl<'a, C> VideoAnnotateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -618,13 +608,15 @@ impl<'a, C> VideoAnnotateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/videointelligence1_beta1/src/client.rs b/gen/videointelligence1_beta1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/videointelligence1_beta1/src/client.rs +++ b/gen/videointelligence1_beta1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/vision1-cli/src/main.rs b/gen/vision1-cli/src/main.rs index 5fd440e734..b694b01155 100644 --- a/gen/vision1-cli/src/main.rs +++ b/gen/vision1-cli/src/main.rs @@ -652,7 +652,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/vision1/src/api.rs b/gen/vision1/src/api.rs index 1884e46e48..59c7e33184 100644 --- a/gen/vision1/src/api.rs +++ b/gen/vision1/src/api.rs @@ -2872,25 +2872,15 @@ impl<'a, C> FileAnnotateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2898,13 +2888,15 @@ impl<'a, C> FileAnnotateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3132,25 +3124,15 @@ impl<'a, C> FileAsyncBatchAnnotateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3158,13 +3140,15 @@ impl<'a, C> FileAsyncBatchAnnotateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3392,25 +3376,15 @@ impl<'a, C> ImageAnnotateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3418,13 +3392,15 @@ impl<'a, C> ImageAnnotateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3652,25 +3628,15 @@ impl<'a, C> ImageAsyncBatchAnnotateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3678,13 +3644,15 @@ impl<'a, C> ImageAsyncBatchAnnotateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3918,25 +3886,15 @@ impl<'a, C> LocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3944,13 +3902,15 @@ impl<'a, C> LocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4206,25 +4166,15 @@ impl<'a, C> OperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4232,13 +4182,15 @@ impl<'a, C> OperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4482,25 +4434,15 @@ impl<'a, C> OperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4508,13 +4450,15 @@ impl<'a, C> OperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -4749,25 +4693,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -4775,13 +4709,15 @@ impl<'a, C> OperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5031,25 +4967,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5057,13 +4983,15 @@ impl<'a, C> OperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5340,25 +5268,15 @@ impl<'a, C> ProjectFileAnnotateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5366,13 +5284,15 @@ impl<'a, C> ProjectFileAnnotateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5637,25 +5557,15 @@ impl<'a, C> ProjectFileAsyncBatchAnnotateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5663,13 +5573,15 @@ impl<'a, C> ProjectFileAsyncBatchAnnotateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -5934,25 +5846,15 @@ impl<'a, C> ProjectImageAnnotateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -5960,13 +5862,15 @@ impl<'a, C> ProjectImageAnnotateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6231,25 +6135,15 @@ impl<'a, C> ProjectImageAsyncBatchAnnotateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6257,13 +6151,15 @@ impl<'a, C> ProjectImageAsyncBatchAnnotateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6528,25 +6424,15 @@ impl<'a, C> ProjectLocationFileAnnotateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6554,13 +6440,15 @@ impl<'a, C> ProjectLocationFileAnnotateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -6825,25 +6713,15 @@ impl<'a, C> ProjectLocationFileAsyncBatchAnnotateCall<'a, C> where C: BorrowMut< return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -6851,13 +6729,15 @@ impl<'a, C> ProjectLocationFileAsyncBatchAnnotateCall<'a, C> where C: BorrowMut< } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7122,25 +7002,15 @@ impl<'a, C> ProjectLocationImageAnnotateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7148,13 +7018,15 @@ impl<'a, C> ProjectLocationImageAnnotateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7419,25 +7291,15 @@ impl<'a, C> ProjectLocationImageAsyncBatchAnnotateCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7445,13 +7307,15 @@ impl<'a, C> ProjectLocationImageAsyncBatchAnnotateCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7695,25 +7559,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7721,13 +7575,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -7972,25 +7828,15 @@ impl<'a, C> ProjectLocationProductSetProductListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -7998,13 +7844,15 @@ impl<'a, C> ProjectLocationProductSetProductListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8274,25 +8122,15 @@ impl<'a, C> ProjectLocationProductSetAddProductCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8300,13 +8138,15 @@ impl<'a, C> ProjectLocationProductSetAddProductCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8576,25 +8416,15 @@ impl<'a, C> ProjectLocationProductSetCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8602,13 +8432,15 @@ impl<'a, C> ProjectLocationProductSetCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -8859,25 +8691,15 @@ impl<'a, C> ProjectLocationProductSetDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8885,13 +8707,15 @@ impl<'a, C> ProjectLocationProductSetDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9126,25 +8950,15 @@ impl<'a, C> ProjectLocationProductSetGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9152,13 +8966,15 @@ impl<'a, C> ProjectLocationProductSetGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9414,25 +9230,15 @@ impl<'a, C> ProjectLocationProductSetImportCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9440,13 +9246,15 @@ impl<'a, C> ProjectLocationProductSetImportCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9700,25 +9508,15 @@ impl<'a, C> ProjectLocationProductSetListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9726,13 +9524,15 @@ impl<'a, C> ProjectLocationProductSetListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10007,25 +9807,15 @@ impl<'a, C> ProjectLocationProductSetPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10033,13 +9823,15 @@ impl<'a, C> ProjectLocationProductSetPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10311,25 +10103,15 @@ impl<'a, C> ProjectLocationProductSetRemoveProductCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10337,13 +10119,15 @@ impl<'a, C> ProjectLocationProductSetRemoveProductCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10613,25 +10397,15 @@ impl<'a, C> ProjectLocationProductReferenceImageCreateCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10639,13 +10413,15 @@ impl<'a, C> ProjectLocationProductReferenceImageCreateCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10896,25 +10672,15 @@ impl<'a, C> ProjectLocationProductReferenceImageDeleteCall<'a, C> where C: Borro return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10922,13 +10688,15 @@ impl<'a, C> ProjectLocationProductReferenceImageDeleteCall<'a, C> where C: Borro } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11163,25 +10931,15 @@ impl<'a, C> ProjectLocationProductReferenceImageGetCall<'a, C> where C: BorrowMu return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11189,13 +10947,15 @@ impl<'a, C> ProjectLocationProductReferenceImageGetCall<'a, C> where C: BorrowMu } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11440,25 +11200,15 @@ impl<'a, C> ProjectLocationProductReferenceImageListCall<'a, C> where C: BorrowM return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11466,13 +11216,15 @@ impl<'a, C> ProjectLocationProductReferenceImageListCall<'a, C> where C: BorrowM } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11747,25 +11499,15 @@ impl<'a, C> ProjectLocationProductCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11773,13 +11515,15 @@ impl<'a, C> ProjectLocationProductCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12030,25 +11774,15 @@ impl<'a, C> ProjectLocationProductDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12056,13 +11790,15 @@ impl<'a, C> ProjectLocationProductDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12297,25 +12033,15 @@ impl<'a, C> ProjectLocationProductGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12323,13 +12049,15 @@ impl<'a, C> ProjectLocationProductGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12574,25 +12302,15 @@ impl<'a, C> ProjectLocationProductListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12600,13 +12318,15 @@ impl<'a, C> ProjectLocationProductListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12881,25 +12601,15 @@ impl<'a, C> ProjectLocationProductPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12907,13 +12617,15 @@ impl<'a, C> ProjectLocationProductPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13185,25 +12897,15 @@ impl<'a, C> ProjectLocationProductPurgeCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13211,13 +12913,15 @@ impl<'a, C> ProjectLocationProductPurgeCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13461,25 +13165,15 @@ impl<'a, C> ProjectOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13487,13 +13181,15 @@ impl<'a, C> ProjectOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/vision1/src/client.rs b/gen/vision1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/vision1/src/client.rs +++ b/gen/vision1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/webfonts1/src/api.rs b/gen/webfonts1/src/api.rs index 074701f557..9a2c327909 100644 --- a/gen/webfonts1/src/api.rs +++ b/gen/webfonts1/src/api.rs @@ -369,25 +369,15 @@ impl<'a, C> WebfontListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -395,13 +385,15 @@ impl<'a, C> WebfontListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/webfonts1/src/client.rs b/gen/webfonts1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/webfonts1/src/client.rs +++ b/gen/webfonts1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/webmasters3/src/api.rs b/gen/webmasters3/src/api.rs index 2c8a3e6b79..50aa643746 100644 --- a/gen/webmasters3/src/api.rs +++ b/gen/webmasters3/src/api.rs @@ -872,25 +872,15 @@ impl<'a, C> SearchanalyticQueryCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -898,13 +888,15 @@ impl<'a, C> SearchanalyticQueryCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1141,25 +1133,15 @@ impl<'a, C> SitemapDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1167,11 +1149,11 @@ impl<'a, C> SitemapDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -1404,25 +1386,15 @@ impl<'a, C> SitemapGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1430,13 +1402,15 @@ impl<'a, C> SitemapGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1678,25 +1652,15 @@ impl<'a, C> SitemapListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1704,13 +1668,15 @@ impl<'a, C> SitemapListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1945,25 +1911,15 @@ impl<'a, C> SitemapSubmitCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1971,11 +1927,11 @@ impl<'a, C> SitemapSubmitCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -2205,25 +2161,15 @@ impl<'a, C> SiteAddCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2231,11 +2177,11 @@ impl<'a, C> SiteAddCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -2455,25 +2401,15 @@ impl<'a, C> SiteDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2481,11 +2417,11 @@ impl<'a, C> SiteDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -2706,25 +2642,15 @@ impl<'a, C> SiteGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2732,13 +2658,15 @@ impl<'a, C> SiteGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2942,25 +2870,15 @@ impl<'a, C> SiteListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2968,13 +2886,15 @@ impl<'a, C> SiteListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/webmasters3/src/client.rs b/gen/webmasters3/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/webmasters3/src/client.rs +++ b/gen/webmasters3/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/webrisk1-cli/src/main.rs b/gen/webrisk1-cli/src/main.rs index 2c6e3a95da..961a33ff00 100644 --- a/gen/webrisk1-cli/src/main.rs +++ b/gen/webrisk1-cli/src/main.rs @@ -67,7 +67,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["threat-types", "hash-prefix"].iter().map(|v|*v)); + v.extend(["hash-prefix", "threat-types"].iter().map(|v|*v)); v } )); } } @@ -311,7 +311,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -548,7 +548,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["constraints-supported-compressions", "threat-type", "constraints-max-diff-entries", "version-token", "constraints-max-database-entries"].iter().map(|v|*v)); + v.extend(["constraints-max-database-entries", "constraints-max-diff-entries", "constraints-supported-compressions", "threat-type", "version-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/webrisk1/src/api.rs b/gen/webrisk1/src/api.rs index 86b464b609..9c52c0e6d4 100644 --- a/gen/webrisk1/src/api.rs +++ b/gen/webrisk1/src/api.rs @@ -979,25 +979,15 @@ impl<'a, C> HasheSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1005,13 +995,15 @@ impl<'a, C> HasheSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1264,25 +1256,15 @@ impl<'a, C> ProjectOperationCancelCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1290,13 +1272,15 @@ impl<'a, C> ProjectOperationCancelCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1509,25 +1493,15 @@ impl<'a, C> ProjectOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1535,13 +1509,15 @@ impl<'a, C> ProjectOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1753,25 +1729,15 @@ impl<'a, C> ProjectOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1779,13 +1745,15 @@ impl<'a, C> ProjectOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2027,25 +1995,15 @@ impl<'a, C> ProjectOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2053,13 +2011,15 @@ impl<'a, C> ProjectOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2313,25 +2273,15 @@ impl<'a, C> ProjectSubmissionCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2339,13 +2289,15 @@ impl<'a, C> ProjectSubmissionCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2610,25 +2562,15 @@ impl<'a, C> ProjectUriSubmitCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2636,13 +2578,15 @@ impl<'a, C> ProjectUriSubmitCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2886,25 +2830,15 @@ impl<'a, C> ThreatListComputeDiffCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2912,13 +2846,15 @@ impl<'a, C> ThreatListComputeDiffCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3164,25 +3100,15 @@ impl<'a, C> UriSearchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3190,13 +3116,15 @@ impl<'a, C> UriSearchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/webrisk1/src/client.rs b/gen/webrisk1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/webrisk1/src/client.rs +++ b/gen/webrisk1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/workflowexecutions1-cli/src/main.rs b/gen/workflowexecutions1-cli/src/main.rs index 85e6a69215..337fd55c5f 100644 --- a/gen/workflowexecutions1-cli/src/main.rs +++ b/gen/workflowexecutions1-cli/src/main.rs @@ -303,7 +303,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["view", "page-token", "page-size"].iter().map(|v|*v)); + v.extend(["page-size", "page-token", "view"].iter().map(|v|*v)); v } )); } } diff --git a/gen/workflowexecutions1/src/api.rs b/gen/workflowexecutions1/src/api.rs index dce3875f9c..2f019e5f4c 100644 --- a/gen/workflowexecutions1/src/api.rs +++ b/gen/workflowexecutions1/src/api.rs @@ -597,25 +597,15 @@ impl<'a, C> ProjectLocationWorkflowExecutionCancelCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -623,13 +613,15 @@ impl<'a, C> ProjectLocationWorkflowExecutionCancelCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -894,25 +886,15 @@ impl<'a, C> ProjectLocationWorkflowExecutionCreateCall<'a, C> where C: BorrowMut return Err(client::Error::HttpError(err)) } Ok(mut res) => { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -920,13 +902,15 @@ impl<'a, C> ProjectLocationWorkflowExecutionCreateCall<'a, C> where C: BorrowMut } dlg.finished(false); return match json::from_str::(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1175,25 +1159,15 @@ impl<'a, C> ProjectLocationWorkflowExecutionGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1201,13 +1175,15 @@ impl<'a, C> ProjectLocationWorkflowExecutionGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1464,25 +1440,15 @@ impl<'a, C> ProjectLocationWorkflowExecutionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1490,13 +1456,15 @@ impl<'a, C> ProjectLocationWorkflowExecutionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/workflowexecutions1/src/client.rs b/gen/workflowexecutions1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/workflowexecutions1/src/client.rs +++ b/gen/workflowexecutions1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/workflows1-cli/src/main.rs b/gen/workflows1-cli/src/main.rs index 353789a3ee..deceed7646 100644 --- a/gen/workflows1-cli/src/main.rs +++ b/gen/workflows1-cli/src/main.rs @@ -122,7 +122,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -288,7 +288,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "filter", "page-token"].iter().map(|v|*v)); + v.extend(["filter", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -555,7 +555,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-size", "order-by", "page-token", "filter"].iter().map(|v|*v)); + v.extend(["filter", "order-by", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/workflows1/src/api.rs b/gen/workflows1/src/api.rs index 8d3ff021c0..b17da2f5dd 100644 --- a/gen/workflows1/src/api.rs +++ b/gen/workflows1/src/api.rs @@ -747,25 +747,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -773,13 +763,15 @@ impl<'a, C> ProjectLocationOperationDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1014,25 +1006,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1040,13 +1022,15 @@ impl<'a, C> ProjectLocationOperationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1296,25 +1280,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1322,13 +1296,15 @@ impl<'a, C> ProjectLocationOperationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1610,25 +1586,15 @@ impl<'a, C> ProjectLocationWorkflowCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1636,13 +1602,15 @@ impl<'a, C> ProjectLocationWorkflowCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1893,25 +1861,15 @@ impl<'a, C> ProjectLocationWorkflowDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1919,13 +1877,15 @@ impl<'a, C> ProjectLocationWorkflowDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2160,25 +2120,15 @@ impl<'a, C> ProjectLocationWorkflowGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2186,13 +2136,15 @@ impl<'a, C> ProjectLocationWorkflowGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2447,25 +2399,15 @@ impl<'a, C> ProjectLocationWorkflowListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2473,13 +2415,15 @@ impl<'a, C> ProjectLocationWorkflowListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2768,25 +2712,15 @@ impl<'a, C> ProjectLocationWorkflowPatchCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2794,13 +2728,15 @@ impl<'a, C> ProjectLocationWorkflowPatchCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3051,25 +2987,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3077,13 +3003,15 @@ impl<'a, C> ProjectLocationGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -3333,25 +3261,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3359,13 +3277,15 @@ impl<'a, C> ProjectLocationListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/workflows1/src/client.rs b/gen/workflows1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/workflows1/src/client.rs +++ b/gen/workflows1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/youtube3-cli/src/main.rs b/gen/youtube3-cli/src/main.rs index 24a05db09b..7a3908c115 100644 --- a/gen/youtube3-cli/src/main.rs +++ b/gen/youtube3-cli/src/main.rs @@ -173,7 +173,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["channel-id", "region-code", "max-results", "published-before", "home", "page-token", "mine", "published-after"].iter().map(|v|*v)); + v.extend(["channel-id", "home", "max-results", "mine", "page-token", "published-after", "published-before", "region-code"].iter().map(|v|*v)); v } )); } } @@ -232,7 +232,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["on-behalf-of-content-owner", "on-behalf-of"].iter().map(|v|*v)); + v.extend(["on-behalf-of", "on-behalf-of-content-owner"].iter().map(|v|*v)); v } )); } } @@ -293,7 +293,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["tfmt", "on-behalf-of-content-owner", "tlang", "on-behalf-of"].iter().map(|v|*v)); + v.extend(["on-behalf-of", "on-behalf-of-content-owner", "tfmt", "tlang"].iter().map(|v|*v)); v } )); } } @@ -405,7 +405,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sync", "on-behalf-of-content-owner", "on-behalf-of"].iter().map(|v|*v)); + v.extend(["on-behalf-of", "on-behalf-of-content-owner", "sync"].iter().map(|v|*v)); v } )); } } @@ -470,7 +470,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["on-behalf-of-content-owner", "id", "on-behalf-of"].iter().map(|v|*v)); + v.extend(["id", "on-behalf-of", "on-behalf-of-content-owner"].iter().map(|v|*v)); v } )); } } @@ -580,7 +580,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["sync", "on-behalf-of-content-owner", "on-behalf-of"].iter().map(|v|*v)); + v.extend(["on-behalf-of", "on-behalf-of-content-owner", "sync"].iter().map(|v|*v)); v } )); } } @@ -905,7 +905,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["hl", "channel-id", "id", "on-behalf-of-content-owner", "mine"].iter().map(|v|*v)); + v.extend(["channel-id", "hl", "id", "mine", "on-behalf-of-content-owner"].iter().map(|v|*v)); v } )); } } @@ -1091,7 +1091,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["hl", "my-subscribers", "id", "max-results", "for-username", "category-id", "on-behalf-of-content-owner", "managed-by-me", "page-token", "mine"].iter().map(|v|*v)); + v.extend(["category-id", "for-username", "hl", "id", "managed-by-me", "max-results", "mine", "my-subscribers", "on-behalf-of-content-owner", "page-token"].iter().map(|v|*v)); v } )); } } @@ -1464,7 +1464,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["text-format", "video-id", "channel-id", "id", "max-results", "all-threads-related-to-channel-id", "order", "moderation-status", "search-terms", "page-token"].iter().map(|v|*v)); + v.extend(["all-threads-related-to-channel-id", "channel-id", "id", "max-results", "moderation-status", "order", "page-token", "search-terms", "text-format", "video-id"].iter().map(|v|*v)); v } )); } } @@ -1788,7 +1788,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["text-format", "id", "max-results", "parent-id", "page-token"].iter().map(|v|*v)); + v.extend(["id", "max-results", "page-token", "parent-id", "text-format"].iter().map(|v|*v)); v } )); } } @@ -2156,7 +2156,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["on-behalf-of-content-owner", "stream-id", "on-behalf-of-content-owner-channel"].iter().map(|v|*v)); + v.extend(["on-behalf-of-content-owner", "on-behalf-of-content-owner-channel", "stream-id"].iter().map(|v|*v)); v } )); } } @@ -2429,7 +2429,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["broadcast-status", "id", "max-results", "on-behalf-of-content-owner-channel", "on-behalf-of-content-owner", "broadcast-type", "page-token", "mine"].iter().map(|v|*v)); + v.extend(["broadcast-status", "broadcast-type", "id", "max-results", "mine", "on-behalf-of-content-owner", "on-behalf-of-content-owner-channel", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3006,7 +3006,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "hl", "profile-image-size", "max-results"].iter().map(|v|*v)); + v.extend(["hl", "max-results", "page-token", "profile-image-size"].iter().map(|v|*v)); v } )); } } @@ -3201,7 +3201,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "max-results"].iter().map(|v|*v)); + v.extend(["max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3436,7 +3436,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["id", "max-results", "on-behalf-of-content-owner-channel", "on-behalf-of-content-owner", "page-token", "mine"].iter().map(|v|*v)); + v.extend(["id", "max-results", "mine", "on-behalf-of-content-owner", "on-behalf-of-content-owner-channel", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3617,7 +3617,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["mode", "max-results", "filter-by-member-channel-id", "has-access-to-level", "page-token"].iter().map(|v|*v)); + v.extend(["filter-by-member-channel-id", "has-access-to-level", "max-results", "mode", "page-token"].iter().map(|v|*v)); v } )); } } @@ -3913,7 +3913,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["video-id", "playlist-id", "id", "max-results", "on-behalf-of-content-owner", "page-token"].iter().map(|v|*v)); + v.extend(["id", "max-results", "on-behalf-of-content-owner", "page-token", "playlist-id", "video-id"].iter().map(|v|*v)); v } )); } } @@ -4285,7 +4285,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["hl", "channel-id", "id", "max-results", "on-behalf-of-content-owner-channel", "on-behalf-of-content-owner", "page-token", "mine"].iter().map(|v|*v)); + v.extend(["channel-id", "hl", "id", "max-results", "mine", "on-behalf-of-content-owner", "on-behalf-of-content-owner-channel", "page-token"].iter().map(|v|*v)); v } )); } } @@ -4547,7 +4547,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["video-definition", "region-code", "video-category-id", "published-before", "channel-type", "published-after", "relevance-language", "max-results", "location-radius", "for-mine", "video-embeddable", "location", "q", "video-dimension", "for-developer", "for-content-owner", "channel-id", "video-type", "on-behalf-of-content-owner", "safe-search", "order", "video-duration", "video-license", "video-caption", "topic-id", "event-type", "type", "page-token", "video-syndicated", "related-to-video-id"].iter().map(|v|*v)); + v.extend(["channel-id", "channel-type", "event-type", "for-content-owner", "for-developer", "for-mine", "location", "location-radius", "max-results", "on-behalf-of-content-owner", "order", "page-token", "published-after", "published-before", "q", "region-code", "related-to-video-id", "relevance-language", "safe-search", "topic-id", "type", "video-caption", "video-category-id", "video-definition", "video-dimension", "video-duration", "video-embeddable", "video-license", "video-syndicated", "video-type"].iter().map(|v|*v)); v } )); } } @@ -4809,7 +4809,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["for-channel-id", "my-recent-subscribers", "my-subscribers", "channel-id", "id", "on-behalf-of-content-owner-channel", "max-results", "on-behalf-of-content-owner", "order", "page-token", "mine"].iter().map(|v|*v)); + v.extend(["channel-id", "for-channel-id", "id", "max-results", "mine", "my-recent-subscribers", "my-subscribers", "on-behalf-of-content-owner", "on-behalf-of-content-owner-channel", "order", "page-token"].iter().map(|v|*v)); v } )); } } @@ -4871,7 +4871,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "hl", "max-results"].iter().map(|v|*v)); + v.extend(["hl", "max-results", "page-token"].iter().map(|v|*v)); v } )); } } @@ -5785,7 +5785,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["notify-subscribers", "auto-levels", "on-behalf-of-content-owner-channel", "on-behalf-of-content-owner", "stabilize"].iter().map(|v|*v)); + v.extend(["auto-levels", "notify-subscribers", "on-behalf-of-content-owner", "on-behalf-of-content-owner-channel", "stabilize"].iter().map(|v|*v)); v } )); } } @@ -5877,7 +5877,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["max-width", "locale", "hl", "id", "region-code", "chart", "max-results", "video-category-id", "max-height", "on-behalf-of-content-owner", "page-token", "my-rating"].iter().map(|v|*v)); + v.extend(["chart", "hl", "id", "locale", "max-height", "max-results", "max-width", "my-rating", "on-behalf-of-content-owner", "page-token", "region-code", "video-category-id"].iter().map(|v|*v)); v } )); } } diff --git a/gen/youtube3/src/api.rs b/gen/youtube3/src/api.rs index 9a7bca5797..c55d13a714 100644 --- a/gen/youtube3/src/api.rs +++ b/gen/youtube3/src/api.rs @@ -8800,25 +8800,15 @@ impl<'a, C> AbuseReportInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -8826,13 +8816,15 @@ impl<'a, C> AbuseReportInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9099,25 +9091,15 @@ impl<'a, C> ActivityListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9125,13 +9107,15 @@ impl<'a, C> ActivityListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -9401,25 +9385,15 @@ impl<'a, C> CaptionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9427,11 +9401,11 @@ impl<'a, C> CaptionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -9691,25 +9665,15 @@ impl<'a, C> CaptionDownloadCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -9717,11 +9681,11 @@ impl<'a, C> CaptionDownloadCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -10041,25 +10005,15 @@ impl<'a, C> CaptionInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10067,7 +10021,7 @@ impl<'a, C> CaptionInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -10079,7 +10033,7 @@ impl<'a, C> CaptionInsertCall<'a, C> where C: BorrowMut CaptionInsertCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10425,25 +10381,15 @@ impl<'a, C> CaptionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10451,13 +10397,15 @@ impl<'a, C> CaptionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -10809,25 +10757,15 @@ impl<'a, C> CaptionUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -10835,7 +10773,7 @@ impl<'a, C> CaptionUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -10847,7 +10785,7 @@ impl<'a, C> CaptionUpdateCall<'a, C> where C: BorrowMut CaptionUpdateCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11245,25 +11185,15 @@ impl<'a, C> ChannelBannerInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11271,7 +11201,7 @@ impl<'a, C> ChannelBannerInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -11283,7 +11213,7 @@ impl<'a, C> ChannelBannerInsertCall<'a, C> where C: BorrowMut ChannelBannerInsertCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -11582,25 +11514,15 @@ impl<'a, C> ChannelSectionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11608,11 +11530,11 @@ impl<'a, C> ChannelSectionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -11877,25 +11799,15 @@ impl<'a, C> ChannelSectionInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -11903,13 +11815,15 @@ impl<'a, C> ChannelSectionInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12204,25 +12118,15 @@ impl<'a, C> ChannelSectionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12230,13 +12134,15 @@ impl<'a, C> ChannelSectionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12539,25 +12445,15 @@ impl<'a, C> ChannelSectionUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12565,13 +12461,15 @@ impl<'a, C> ChannelSectionUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -12867,25 +12765,15 @@ impl<'a, C> ChannelListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -12893,13 +12781,15 @@ impl<'a, C> ChannelListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13214,25 +13104,15 @@ impl<'a, C> ChannelUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13240,13 +13120,15 @@ impl<'a, C> ChannelUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13504,25 +13386,15 @@ impl<'a, C> CommentThreadInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13530,13 +13402,15 @@ impl<'a, C> CommentThreadInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -13815,25 +13689,15 @@ impl<'a, C> CommentThreadListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -13841,13 +13705,15 @@ impl<'a, C> CommentThreadListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14156,25 +14022,15 @@ impl<'a, C> CommentThreadUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14182,13 +14038,15 @@ impl<'a, C> CommentThreadUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14410,25 +14268,15 @@ impl<'a, C> CommentDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14436,11 +14284,11 @@ impl<'a, C> CommentDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -14671,25 +14519,15 @@ impl<'a, C> CommentInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14697,13 +14535,15 @@ impl<'a, C> CommentInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -14957,25 +14797,15 @@ impl<'a, C> CommentListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -14983,13 +14813,15 @@ impl<'a, C> CommentListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -15239,25 +15071,15 @@ impl<'a, C> CommentMarkAsSpamCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15265,11 +15087,11 @@ impl<'a, C> CommentMarkAsSpamCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -15484,25 +15306,15 @@ impl<'a, C> CommentSetModerationStatuCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15510,11 +15322,11 @@ impl<'a, C> CommentSetModerationStatuCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -15764,25 +15576,15 @@ impl<'a, C> CommentUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -15790,13 +15592,15 @@ impl<'a, C> CommentUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16028,25 +15832,15 @@ impl<'a, C> I18nLanguageListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16054,13 +15848,15 @@ impl<'a, C> I18nLanguageListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16286,25 +16082,15 @@ impl<'a, C> I18nRegionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16312,13 +16098,15 @@ impl<'a, C> I18nRegionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16572,25 +16360,15 @@ impl<'a, C> LiveBroadcastBindCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16598,13 +16376,15 @@ impl<'a, C> LiveBroadcastBindCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -16862,25 +16642,15 @@ impl<'a, C> LiveBroadcastDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -16888,11 +16658,11 @@ impl<'a, C> LiveBroadcastDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -17168,25 +16938,15 @@ impl<'a, C> LiveBroadcastInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17194,13 +16954,15 @@ impl<'a, C> LiveBroadcastInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17515,25 +17277,15 @@ impl<'a, C> LiveBroadcastListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17541,13 +17293,15 @@ impl<'a, C> LiveBroadcastListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -17856,25 +17610,15 @@ impl<'a, C> LiveBroadcastTransitionCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -17882,13 +17626,15 @@ impl<'a, C> LiveBroadcastTransitionCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18198,25 +17944,15 @@ impl<'a, C> LiveBroadcastUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18224,13 +17960,15 @@ impl<'a, C> LiveBroadcastUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18480,25 +18218,15 @@ impl<'a, C> LiveChatBanDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18506,11 +18234,11 @@ impl<'a, C> LiveChatBanDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -18741,25 +18469,15 @@ impl<'a, C> LiveChatBanInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -18767,13 +18485,15 @@ impl<'a, C> LiveChatBanInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -18995,25 +18715,15 @@ impl<'a, C> LiveChatMessageDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19021,11 +18731,11 @@ impl<'a, C> LiveChatMessageDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -19256,25 +18966,15 @@ impl<'a, C> LiveChatMessageInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19282,13 +18982,15 @@ impl<'a, C> LiveChatMessageInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19552,25 +19254,15 @@ impl<'a, C> LiveChatMessageListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19578,13 +19270,15 @@ impl<'a, C> LiveChatMessageListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -19837,25 +19531,15 @@ impl<'a, C> LiveChatModeratorDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -19863,11 +19547,11 @@ impl<'a, C> LiveChatModeratorDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -20098,25 +19782,15 @@ impl<'a, C> LiveChatModeratorInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20124,13 +19798,15 @@ impl<'a, C> LiveChatModeratorInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20384,25 +20060,15 @@ impl<'a, C> LiveChatModeratorListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20410,13 +20076,15 @@ impl<'a, C> LiveChatModeratorListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -20665,25 +20333,15 @@ impl<'a, C> LiveStreamDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20691,11 +20349,11 @@ impl<'a, C> LiveStreamDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -20971,25 +20629,15 @@ impl<'a, C> LiveStreamInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -20997,13 +20645,15 @@ impl<'a, C> LiveStreamInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21309,25 +20959,15 @@ impl<'a, C> LiveStreamListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21335,13 +20975,15 @@ impl<'a, C> LiveStreamListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21659,25 +21301,15 @@ impl<'a, C> LiveStreamUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21685,13 +21317,15 @@ impl<'a, C> LiveStreamUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -21971,25 +21605,15 @@ impl<'a, C> MemberListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -21997,13 +21621,15 @@ impl<'a, C> MemberListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22264,25 +21890,15 @@ impl<'a, C> MembershipsLevelListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22290,13 +21906,15 @@ impl<'a, C> MembershipsLevelListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -22516,25 +22134,15 @@ impl<'a, C> PlaylistItemDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22542,11 +22150,11 @@ impl<'a, C> PlaylistItemDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -22789,25 +22397,15 @@ impl<'a, C> PlaylistItemInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -22815,13 +22413,15 @@ impl<'a, C> PlaylistItemInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23087,25 +22687,15 @@ impl<'a, C> PlaylistItemListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23113,13 +22703,15 @@ impl<'a, C> PlaylistItemListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23405,25 +22997,15 @@ impl<'a, C> PlaylistItemUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23431,13 +23013,15 @@ impl<'a, C> PlaylistItemUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -23671,25 +23255,15 @@ impl<'a, C> PlaylistDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23697,11 +23271,11 @@ impl<'a, C> PlaylistDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -23949,25 +23523,15 @@ impl<'a, C> PlaylistInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -23975,13 +23539,15 @@ impl<'a, C> PlaylistInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24264,25 +23830,15 @@ impl<'a, C> PlaylistListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24290,13 +23846,15 @@ impl<'a, C> PlaylistListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -24597,25 +24155,15 @@ impl<'a, C> PlaylistUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -24623,13 +24171,15 @@ impl<'a, C> PlaylistUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25015,25 +24565,15 @@ impl<'a, C> SearchListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25041,13 +24581,15 @@ impl<'a, C> SearchListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -25468,25 +25010,15 @@ impl<'a, C> SubscriptionDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25494,11 +25026,11 @@ impl<'a, C> SubscriptionDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -25729,25 +25261,15 @@ impl<'a, C> SubscriptionInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -25755,13 +25277,15 @@ impl<'a, C> SubscriptionInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26045,25 +25569,15 @@ impl<'a, C> SubscriptionListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26071,13 +25585,15 @@ impl<'a, C> SubscriptionListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26399,25 +25915,15 @@ impl<'a, C> SuperChatEventListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26425,13 +25931,15 @@ impl<'a, C> SuperChatEventListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26696,25 +26204,15 @@ impl<'a, C> TestInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26722,13 +26220,15 @@ impl<'a, C> TestInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -26950,25 +26450,15 @@ impl<'a, C> ThirdPartyLinkDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -26976,11 +26466,11 @@ impl<'a, C> ThirdPartyLinkDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -27209,25 +26699,15 @@ impl<'a, C> ThirdPartyLinkInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27235,13 +26715,15 @@ impl<'a, C> ThirdPartyLinkInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27466,25 +26948,15 @@ impl<'a, C> ThirdPartyLinkListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27492,13 +26964,15 @@ impl<'a, C> ThirdPartyLinkListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -27736,25 +27210,15 @@ impl<'a, C> ThirdPartyLinkUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -27762,13 +27226,15 @@ impl<'a, C> ThirdPartyLinkUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28025,25 +27491,15 @@ impl<'a, C> ThumbnailSetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28051,7 +27507,7 @@ impl<'a, C> ThumbnailSetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -28063,7 +27519,7 @@ impl<'a, C> ThumbnailSetCall<'a, C> where C: BorrowMut ThumbnailSetCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28369,25 +27827,15 @@ impl<'a, C> VideoAbuseReportReasonListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28395,13 +27843,15 @@ impl<'a, C> VideoAbuseReportReasonListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28644,25 +28094,15 @@ impl<'a, C> VideoCategoryListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28670,13 +28110,15 @@ impl<'a, C> VideoCategoryListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -28911,25 +28353,15 @@ impl<'a, C> VideoDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -28937,11 +28369,11 @@ impl<'a, C> VideoDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -29160,25 +28592,15 @@ impl<'a, C> VideoGetRatingCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29186,13 +28608,15 @@ impl<'a, C> VideoGetRatingCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29507,25 +28931,15 @@ impl<'a, C> VideoInsertCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29533,7 +28947,7 @@ impl<'a, C> VideoInsertCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -29545,7 +28959,7 @@ impl<'a, C> VideoInsertCall<'a, C> where C: BorrowMut VideoInsertCall<'a, C> where C: BorrowMut (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -29934,25 +29350,15 @@ impl<'a, C> VideoListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -29960,13 +29366,15 @@ impl<'a, C> VideoListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -30261,25 +29669,15 @@ impl<'a, C> VideoRateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30287,11 +29685,11 @@ impl<'a, C> VideoRateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -30526,25 +29924,15 @@ impl<'a, C> VideoReportAbuseCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30552,11 +29940,11 @@ impl<'a, C> VideoReportAbuseCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) @@ -30799,25 +30187,15 @@ impl<'a, C> VideoUpdateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -30825,13 +30203,15 @@ impl<'a, C> VideoUpdateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -31131,25 +30511,15 @@ impl<'a, C> WatermarkSetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31157,7 +30527,7 @@ impl<'a, C> WatermarkSetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } @@ -31169,7 +30539,7 @@ impl<'a, C> WatermarkSetCall<'a, C> where C: BorrowMut WatermarkSetCall<'a, C> where C: BorrowMut WatermarkUnsetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -31481,11 +30841,11 @@ impl<'a, C> WatermarkUnsetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } - let result_value = reconstructed_result; + let result_value = res; dlg.finished(true); return Ok(result_value) diff --git a/gen/youtube3/src/client.rs b/gen/youtube3/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/youtube3/src/client.rs +++ b/gen/youtube3/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/gen/youtubereporting1-cli/src/main.rs b/gen/youtubereporting1-cli/src/main.rs index 32b113ebaf..80f9c3f4ff 100644 --- a/gen/youtubereporting1-cli/src/main.rs +++ b/gen/youtubereporting1-cli/src/main.rs @@ -279,7 +279,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "include-system-managed", "on-behalf-of-content-owner", "page-size"].iter().map(|v|*v)); + v.extend(["include-system-managed", "on-behalf-of-content-owner", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } @@ -406,7 +406,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["start-time-at-or-after", "page-token", "on-behalf-of-content-owner", "start-time-before", "created-after", "page-size"].iter().map(|v|*v)); + v.extend(["created-after", "on-behalf-of-content-owner", "page-size", "page-token", "start-time-at-or-after", "start-time-before"].iter().map(|v|*v)); v } )); } } @@ -533,7 +533,7 @@ impl<'n> Engine<'n> { err.issues.push(CLIError::UnknownParameter(key.to_string(), {let mut v = Vec::new(); v.extend(self.gp.iter().map(|v|*v)); - v.extend(["page-token", "include-system-managed", "on-behalf-of-content-owner", "page-size"].iter().map(|v|*v)); + v.extend(["include-system-managed", "on-behalf-of-content-owner", "page-size", "page-token"].iter().map(|v|*v)); v } )); } } diff --git a/gen/youtubereporting1/src/api.rs b/gen/youtubereporting1/src/api.rs index 6797fe7c76..ed6cdb0e5f 100644 --- a/gen/youtubereporting1/src/api.rs +++ b/gen/youtubereporting1/src/api.rs @@ -1107,25 +1107,15 @@ impl<'a, C> JobReportGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1133,13 +1123,15 @@ impl<'a, C> JobReportGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1417,25 +1409,15 @@ impl<'a, C> JobReportListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1443,13 +1425,15 @@ impl<'a, C> JobReportListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1725,25 +1709,15 @@ impl<'a, C> JobCreateCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -1751,13 +1725,15 @@ impl<'a, C> JobCreateCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -1999,25 +1975,15 @@ impl<'a, C> JobDeleteCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2025,13 +1991,15 @@ impl<'a, C> JobDeleteCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2274,25 +2242,15 @@ impl<'a, C> JobGetCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2300,13 +2258,15 @@ impl<'a, C> JobGetCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2541,25 +2501,15 @@ impl<'a, C> JobListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2567,13 +2517,15 @@ impl<'a, C> JobListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); @@ -2847,25 +2799,15 @@ impl<'a, C> MediaDownloadCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -2873,19 +2815,21 @@ impl<'a, C> MediaDownloadCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = if enable_resource_parsing { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); } } - } else { (reconstructed_result, Default::default()) }; + } else { (res, Default::default()) }; dlg.finished(true); return Ok(result_value) @@ -3107,25 +3051,15 @@ impl<'a, C> ReportTypeListCall<'a, C> where C: BorrowMut { - let (res_parts, res_body) = res.into_parts(); - let res_body_string: String = String::from_utf8( - hyper::body::to_bytes(res_body) - .await - .unwrap() - .into_iter() - .collect(), - ) - .unwrap(); - let reconstructed_result = - hyper::Response::from_parts(res_parts, res_body_string.clone().into()); + if !res.status().is_success() { + let res_body_string = client::get_body_as_string(res.body_mut()).await; - if !reconstructed_result.status().is_success() { let json_server_error = json::from_str::(&res_body_string).ok(); let server_error = json::from_str::(&res_body_string) .or_else(|_| json::from_str::(&res_body_string).map(|r| r.error)) .ok(); - if let client::Retry::After(d) = dlg.http_failure(&reconstructed_result, + if let client::Retry::After(d) = dlg.http_failure(&res, json_server_error, server_error) { sleep(d); @@ -3133,13 +3067,15 @@ impl<'a, C> ReportTypeListCall<'a, C> where C: BorrowMut(&res_body_string){ - Err(_) => Err(client::Error::Failure(reconstructed_result)), + Err(_) => Err(client::Error::Failure(res)), Ok(serr) => Err(client::Error::BadRequest(serr)) } } let result_value = { + let res_body_string = client::get_body_as_string(res.body_mut()).await; + match json::from_str(&res_body_string) { - Ok(decoded) => (reconstructed_result, decoded), + Ok(decoded) => (res, decoded), Err(err) => { dlg.response_json_decode_error(&res_body_string, &err); return Err(client::Error::JsonDecodeError(res_body_string, err)); diff --git a/gen/youtubereporting1/src/client.rs b/gen/youtubereporting1/src/client.rs index 94a8df7d41..db29a8e6cd 100644 --- a/gen/youtubereporting1/src/client.rs +++ b/gen/youtubereporting1/src/client.rs @@ -14,6 +14,7 @@ use hyper; use hyper::header::{HeaderMap, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT}; use hyper::Method; use hyper::StatusCode; +use hyper::body::Buf; use mime::{Attr, Mime, SubLevel, TopLevel, Value}; use oauth2; @@ -806,3 +807,10 @@ pub fn remove_json_null_values(value: &mut json::value::Value) { _ => {} } } + +// Borrowing the body object as mutable and converts it to a string +pub async fn get_body_as_string(res_body: &mut hyper::Body) -> String { + let res_body_buf = hyper::body::aggregate(res_body).await.unwrap(); + let res_body_string = String::from_utf8_lossy(res_body_buf.chunk()); + res_body_string.to_string() +} diff --git a/src/mako/lib/cli.py b/src/mako/lib/cli.py index 514d253a17..215f0f1806 100644 --- a/src/mako/lib/cli.py +++ b/src/mako/lib/cli.py @@ -99,7 +99,7 @@ def new_method_context(resource, method, c): required_props, optional_props, part_prop) def comma_sep_fields(fields): - return ', '.join('"%s"' % mangle_subcommand(f) for f in fields) + return ', '.join('"%s"' % mangle_subcommand(f) for f in sorted(fields)) # Returns a string representing a string-vector of mangled names # fields is an iterator